diff options
author | Android Build Merger (Role) <android-build-merger@google.com> | 2016-07-15 20:17:35 +0000 |
---|---|---|
committer | Android (Google) Code Review <android-gerrit@google.com> | 2016-07-15 20:17:36 +0000 |
commit | dbf15041288c659ab5f16742f4c56eb11b537114 (patch) | |
tree | 968a7ad4d599734d30168d5cad10be7921f2575e /tools/aapt2/java/JavaClassGenerator_test.cpp | |
parent | 79b1bb487843536a8363627b05a3ff70c6a9be59 (diff) | |
parent | dc1a984b49bbc4883c0fa53e93d9a9d484d0759b (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
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions