diff options
| author | Wu Ahan <ahanwu@google.com> | 2020-06-03 19:55:21 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-06-03 19:55:21 +0000 |
| commit | 4f9c72c1166f82755dc7dd50248bac894ba28979 (patch) | |
| tree | 101c7166521a59b9bd0a4f16ad0a250f16c987a7 /tools/aapt2/java/JavaClassGenerator_test.cpp | |
| parent | bfa126dd67bc5d8b4e7e3c8affb5be95bab91fad (diff) | |
| parent | 7467df3815ca2db61bf4228f637c8adf46b3f20f (diff) | |
[automerger skipped] Merge "DO NOT MERGE Prevent ImageWallpaper from keeping crashing" into oc-dev am: c34919e166 am: 804d42f1ef am: 172a0954c5 -s ours am: b8e311740b -s ours am: 95c4e942dc am: 170465e0a2 -s ours am: 27c4aef372 am: 9948425ec5 am: 56e2b96ef7 am: 7467df3815 -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11700786
Change-Id: I0005fbe02e38ece3a6a17673424528f1718c9bd8
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions