summaryrefslogtreecommitdiff
path: root/tools/aapt2/java/JavaClassGenerator_test.cpp
diff options
context:
space:
mode:
authorWale Ogunwale <ogunwale@google.com>2015-07-09 00:30:17 +0000
committerAndroid Git Automerger <android-git-automerger@android.com>2015-07-09 00:30:17 +0000
commit569a271f0c32a66b33f305e5181c7687b6303aa5 (patch)
tree77ecb28545803dcf8b5d941804ac1a35e4ed33b9 /tools/aapt2/java/JavaClassGenerator_test.cpp
parent886fd2f5a05a5e36ac20f95c1c06e1716a52c8e9 (diff)
parent1fee5522b60d9c24c9b30b5c995e72df191f7d50 (diff)
am 1fee5522: am dad62b9f: Merge "Finish already paused activity if it should be finished after pausing" into mnc-dev
* commit '1fee5522b60d9c24c9b30b5c995e72df191f7d50': Finish already paused activity if it should be finished after pausing
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions