diff options
author | Wale Ogunwale <ogunwale@google.com> | 2015-09-03 18:31:00 +0000 |
---|---|---|
committer | Android Git Automerger <android-git-automerger@android.com> | 2015-09-03 18:31:00 +0000 |
commit | 68025995632d2f4dc8e3fd9e7d518868c72d9e82 (patch) | |
tree | f972e2c6d546b7246e207d6cd3d4b704909c9abd /tools/aapt2/java/JavaClassGenerator.cpp | |
parent | 87e4c951bf876faefad9f4223f6a568777425ae7 (diff) | |
parent | 1942f8a72dbbd6e436c4744bdfa8c79a7d6aae4d (diff) |
am 1942f8a7: am d4ef34ce: am 512141d5: Merge "Respect DONT_KILL_APP flag when bringing down a disabled service." into mnc-dev
* commit '1942f8a72dbbd6e436c4744bdfa8c79a7d6aae4d':
Respect DONT_KILL_APP flag when bringing down a disabled service.
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator.cpp')
0 files changed, 0 insertions, 0 deletions