summaryrefslogtreecommitdiff
path: root/tools/aapt2/java/JavaClassGenerator_test.cpp
diff options
context:
space:
mode:
authorAndroid Build Merger (Role) <android-build-merger@google.com>2016-06-20 23:16:49 +0000
committerAndroid (Google) Code Review <android-gerrit@google.com>2016-06-20 23:16:50 +0000
commitc9077221bb339dd273394b27e8eb4d6cdb163a4d (patch)
tree264881259056333f5d5ad385fce11bfdc6918f4a /tools/aapt2/java/JavaClassGenerator_test.cpp
parent7d145e279b445a3faf5088dfa5a8f3ff444c50d2 (diff)
parenta552f9deda84e0ef1acc832d6d6623e1ee757ce6 (diff)
Merge "Merge \\"Don\\'t re-launch stopped activities while the device is sleeping\\" into nyc-dev am: f159b74608 am: 6d296286e4" into nyc-mr1-dev-plus-aosp
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions