diff options
| author | Craig Mautner <cmautner@google.com> | 2015-01-22 00:45:54 +0000 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2015-01-22 00:45:54 +0000 |
| commit | f9c240ee655ddece0627adc2f94f7132a7784b67 (patch) | |
| tree | e6d4589d4b761f31cbdb8df606d7fab0fd55cf5e /tools/aapt2/java/JavaClassGenerator_test.cpp | |
| parent | 8efe9ff6e919c18f9cb6910c22e0bd7328ee2b92 (diff) | |
| parent | f6ab9afc46638fbe1122dee6c9c491198f0da961 (diff) | |
am d56352db: am c79a8ea0: Merge "Resume home activity can skip resume and cause ANR. DO NOT MERGE" into lmp-mr1-dev
automerge: f6ab9af -s ours
* commit 'f6ab9afc46638fbe1122dee6c9c491198f0da961':
Resume home activity can skip resume and cause ANR. DO NOT MERGE
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions