tree 221924c0f7948629cf448458b89f890deb01f876
parent 8f4f0c34e0f74bc1ab6e16628fe66b586effcaf9
parent 849fb37fee9b6bb3aca5fb63a061933a3563daee
author Loic Poulain <loic.poulain@linaro.org> 1505156817 +0000
committer android-build-merger <android-build-merger@google.com> 1505156817 +0000

Merge "hikey/hikey960: Add device admin feature" am: 2a1fc3229b am: ae17df2860 am: eec900528e
am: 849fb37fee

Change-Id: Ia477082e5d884cfd90a7c7507c116559e25103f2