diff options
author | Dan Yu <dsyu@google.com> | 2016-07-15 23:14:04 +0000 |
---|---|---|
committer | android-build-merger <android-build-merger@google.com> | 2016-07-15 23:14:04 +0000 |
commit | 4274dc65dc09e075d578cbde39ecd56d01e61f3f (patch) | |
tree | b4fa2ec70192e0e70df86c23c4d8aecaab03f9be /tools/aapt2/java/JavaClassGenerator_test.cpp | |
parent | 915544654c17ed8ad2b992a0e71f924be363ef3a (diff) | |
parent | dbf15041288c659ab5f16742f4c56eb11b537114 (diff) |
Merge \"Merge \\\"docs: Adding update for DevicePolicyManager.getStorageEncryptionStatus() and Direct Boot for DP5\\\" into nyc-dev am: 344a7375d7 am: d5b43852dc\" into nyc-mr1-dev-plus-aosp
am: dbf1504128
Change-Id: Iacb23044e44049877b76e7a07426161f5a0a95f9
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions