diff options
author | Wei Liu <luciferleo@google.com> | 2016-09-22 19:02:16 +0000 |
---|---|---|
committer | android-build-merger <android-build-merger@google.com> | 2016-09-22 19:02:16 +0000 |
commit | aa09bef939bcf1fd461b437f84b7edd3ddd71abb (patch) | |
tree | 3bd3187530a5cdc06a77bb8650134f80524a7a9d /tools/aapt2/java/JavaClassGenerator_test.cpp | |
parent | 973a07c87e3c5b1cbe79edc2991f312d69f623c1 (diff) | |
parent | 0712525f13337a5fcee1316425b2697551c7bc17 (diff) |
Merge "Allow shell to acquire wakelock." into cw-f-dev
am: 0712525f13
Change-Id: I1a081a2906acb5456f9dfdb57bcd82c99ecf4b60
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions