diff options
author | Pavel Grafov <pgrafov@google.com> | 2017-08-31 16:05:25 +0000 |
---|---|---|
committer | android-build-merger <android-build-merger@google.com> | 2017-08-31 16:05:25 +0000 |
commit | 9864fa8dcd729ddfdaa9b538955204aecc5df72b (patch) | |
tree | eb811d39a13b18c9ccd83ad5a42324b40ef4e8f5 /tools/aapt2/java/JavaClassGenerator_test.cpp | |
parent | ad76d1f799f08fe48874e78694abddb51f44aabb (diff) | |
parent | 1b3a751d23d0533bdbeea45d54e9b67431cece96 (diff) |
Merge "Unlock managed profile keystore when user is unlocked." into oc-mr1-dev am: 060b87b068
am: 1b3a751d23
Change-Id: I6c04772912639bd28bd6a7831048b34f1f9dbf87
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions