diff options
author | Wale Ogunwale <ogunwale@google.com> | 2015-09-03 18:42:38 +0000 |
---|---|---|
committer | Android Git Automerger <android-git-automerger@android.com> | 2015-09-03 18:42:38 +0000 |
commit | c2f9e4323cda3090cfa9197eb402f9279a72b224 (patch) | |
tree | 94ac32478a6f1cc1ef34de160a3838b5acda70d8 /tools/aapt2/java/JavaClassGenerator_test.cpp | |
parent | 7f7ffa3722ef90a7bf5611221c4a4c9d06823a38 (diff) | |
parent | 68025995632d2f4dc8e3fd9e7d518868c72d9e82 (diff) |
am 68025995: am 1942f8a7: am d4ef34ce: am 512141d5: Merge "Respect DONT_KILL_APP flag when bringing down a disabled service." into mnc-dev
* commit '68025995632d2f4dc8e3fd9e7d518868c72d9e82':
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