summaryrefslogtreecommitdiff
path: root/tools/aapt2/java/JavaClassGenerator_test.cpp
diff options
context:
space:
mode:
authorWale Ogunwale <ogunwale@google.com>2015-09-03 18:14:13 +0000
committerAndroid Git Automerger <android-git-automerger@android.com>2015-09-03 18:14:13 +0000
commit1942f8a72dbbd6e436c4744bdfa8c79a7d6aae4d (patch)
tree667034bd92614d5edfbeaaf744ed8e24ae8c2828 /tools/aapt2/java/JavaClassGenerator_test.cpp
parent59c1a0e1cb6cad46e30821e25f99c1ecce1227f0 (diff)
parentd4ef34ce8d9cfb351e1a063ce2ff354ee0b9c13b (diff)
am d4ef34ce: am 512141d5: Merge "Respect DONT_KILL_APP flag when bringing down a disabled service." into mnc-dev
* commit 'd4ef34ce8d9cfb351e1a063ce2ff354ee0b9c13b': Respect DONT_KILL_APP flag when bringing down a disabled service.
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions