tree 221924c0f7948629cf448458b89f890deb01f876
parent 46eb4fffc8663686604c101ed723759343b6b5e2
parent 2a1fc3229b3d7a44241a72c564dcb0b205832640
author Loic Poulain <loic.poulain@linaro.org> 1505155215 +0000
committer android-build-merger <android-build-merger@google.com> 1505155215 +0000

Merge "hikey/hikey960: Add device admin feature"
am: 2a1fc3229b

Change-Id: I2e634b362eb466f2efd9afa225034abcd219ba18