diff options
author | Robert Carr <racarr@google.com> | 2017-07-24 20:27:04 +0000 |
---|---|---|
committer | android-build-merger <android-build-merger@google.com> | 2017-07-24 20:27:04 +0000 |
commit | a223aea14c5e6af910c67afc3cab0b725495445d (patch) | |
tree | 678b7800e45bd84f455085f459ba8ab235d9d098 /tools/aapt2/java/JavaClassGenerator.cpp | |
parent | b265a3699589d9c3bd05e08b29255432b74a7d95 (diff) | |
parent | 0748e23073e25bdccceba63a5992180f14ac26a2 (diff) |
Merge "Merge "Ignore "mLastHidden" state when deciding whether to turnScreenOn." into oc-dr1-dev am: cf3b6afe01 am: 4e5c3fbd99" into oc-mr1-dev-plus-aosp
am: 0748e23073
Change-Id: I06e3a43bd01125639b278e027da53b5f6e897de7
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator.cpp')
0 files changed, 0 insertions, 0 deletions