summaryrefslogtreecommitdiff
path: root/tools/aapt2/java/JavaClassGenerator_test.cpp
diff options
context:
space:
mode:
authorWale Ogunwale <ogunwale@google.com>2016-06-20 21:28:32 +0000
committerandroid-build-merger <android-build-merger@google.com>2016-06-20 21:28:32 +0000
commit40f3540e0bbbded8e0173b0e5b9dedd9915f250f (patch)
tree6bf5e644ac29b605c4c1b58ca757875e76679e63 /tools/aapt2/java/JavaClassGenerator_test.cpp
parentc07a7518d6bfd85fcc1ad15e72cf0fe8014ef0d0 (diff)
parent96eea7136a795b225eda6b7542acf0f958e55b56 (diff)
Merge \\"Revert \\"Don\\'t re-launch activities while the device is sleeping\\"\\" into nyc-dev am: beaf3707fa
am: 96eea7136a Change-Id: I5f76f0854d0831839f87f2faccaba690d864c5b8
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions