diff options
| author | Craig Mautner <cmautner@google.com> | 2014-12-05 21:40:26 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2014-12-05 21:40:26 +0000 |
| commit | 655dd3eb171d7b42678529a9c5a2075ab89a1698 (patch) | |
| tree | 816cb427fbaec19aaf87682d4b0438d1ae7c3545 /tools/aapt2/java/JavaClassGenerator_test.cpp | |
| parent | 004540260c02222fe2c611823c428e02b4a8a135 (diff) | |
| parent | 435496e1ac4d3e9d1381619ae54f6812c6a8ed0d (diff) | |
am 435496e1: am c2cae50b: Merge "Reset killedByAm flag at attachApplicationLocked" into lmp-mr1-dev
* commit '435496e1ac4d3e9d1381619ae54f6812c6a8ed0d':
Reset killedByAm flag at attachApplicationLocked
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions