diff options
| author | Dianne Hackborn <hackbod@google.com> | 2015-10-23 18:35:44 +0000 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2015-10-23 18:35:44 +0000 |
| commit | 5456721c2a9b5186f896eac9a4302c793e6fb478 (patch) | |
| tree | 7f786b51ffbaff716f4d13764e43be3e6a1a7520 /tools/aapt2/java/JavaClassGenerator_test.cpp | |
| parent | f5ae4de7bad43579a00dbd3b9cc6412bbb9420fe (diff) | |
| parent | 1d7d1e8282cca0f9a9554e9c31f51eaa1cdb545a (diff) | |
Merge "DO NOT MERGE Fix issue #24118803: The screen doesn\'t turn off..." into mnc-dr-dev am: b32e020d23 am: 9161871f83 am: 6ff08bd48c
am: 1d7d1e8282 -s ours
* commit '1d7d1e8282cca0f9a9554e9c31f51eaa1cdb545a':
DO NOT MERGE Fix issue #24118803: The screen doesn't turn off...
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions