diff options
| author | Android Build Merger (Role) <android-build-merger@google.com> | 2016-12-14 18:28:47 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2016-12-14 18:28:51 +0000 |
| commit | 6b45e658c3d398a1a1ebb53931ffcedc5b7fe0a8 (patch) | |
| tree | 3c589f940991b47286229dc9aaa0c85ae2842f58 /tools/aapt2/java/JavaClassGenerator_test.cpp | |
| parent | 95a310dbdf2a72e4364493c4ae6c1a7853a7f3c2 (diff) | |
| parent | b12f654aac54b16ffe3590f5014870a551b7a72a (diff) | |
Merge "DO NOT MERGE ANYWHERE: Hold a wake lock while DeviceIdleController is going idle. am: f9f39cc4a8 -s ours am: 589f83e686 -s ours am: 495aa09cc6 -s ours am: 10a9005003 -s ours am: 03c946e06b -s ours am: c2aed112a7 -s ours am: 323f2dbc46 -s ours am: d8a6e8eaa2 -s ours"
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions