diff options
author | Matthew Williams <mjwilliams@google.com> | 2015-08-10 22:59:33 +0000 |
---|---|---|
committer | Android Git Automerger <android-git-automerger@android.com> | 2015-08-10 22:59:33 +0000 |
commit | ae88437d292f253f2bdea16cbe381e0ae46b15ab (patch) | |
tree | 663305da33e68b7bda9e498660ab712eb85befb7 /tools/aapt2/java/JavaClassGenerator_test.cpp | |
parent | d4c0b52e2a425dbc6e3794aae33595959453e777 (diff) | |
parent | 83682890190c9a5b73e1742a58c1e017ac418ee2 (diff) |
am 83682890: am 2c8c251e: am 77d5b914: Merge "DO NOT MERGE: Idle Job Start During SCREEN_ON or DREAMING_STOPPED" into mnc-dev
* commit '83682890190c9a5b73e1742a58c1e017ac418ee2':
DO NOT MERGE: Idle Job Start During SCREEN_ON or DREAMING_STOPPED
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions