diff options
author | Daniel Yu <dsyu@google.com> | 2016-07-15 20:09:34 +0000 |
---|---|---|
committer | android-build-merger <android-build-merger@google.com> | 2016-07-15 20:09:34 +0000 |
commit | 7b10126ed6ee9f21a0b47990defb73301e1808fe (patch) | |
tree | c4eee9669ed4881f211fc0c3dd82c66bbfaceca7 /tools/aapt2/java/JavaClassGenerator_test.cpp | |
parent | 6198b6cdfbe306fb6426a85c5973d2f4d018d076 (diff) | |
parent | 344a7375d7a8a63edf2fd91b4578f25b45cd06b6 (diff) |
Merge \"docs: Adding update for DevicePolicyManager.getStorageEncryptionStatus() and Direct Boot for DP5\" into nyc-dev
am: 344a7375d7
Change-Id: I9f05ab3452788942b6fc3e0d45ed92e0e5401ea6
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions