diff options
author | Wale Ogunwale <ogunwale@google.com> | 2016-06-20 21:27:47 +0000 |
---|---|---|
committer | android-build-merger <android-build-merger@google.com> | 2016-06-20 21:27:47 +0000 |
commit | 4553be6e301e328fc53513858b97c90f318b17c6 (patch) | |
tree | 6bf5e644ac29b605c4c1b58ca757875e76679e63 /tools/aapt2/java/JavaClassGenerator_test.cpp | |
parent | c07a7518d6bfd85fcc1ad15e72cf0fe8014ef0d0 (diff) | |
parent | f9295608135162c6e6eab2535d404ddec5af725d (diff) |
Merge \\"Revert \\"Don\\'t re-launch activities while the device is sleeping\\"\\" into nyc-dev am: beaf3707fa
am: f929560813
Change-Id: Iab35cc9bcfffef209ef45707feb4498165a0507b
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions