diff options
| author | Wu Ahan <ahanwu@google.com> | 2020-06-03 19:41:47 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-06-03 19:41:47 +0000 |
| commit | 7467df3815ca2db61bf4228f637c8adf46b3f20f (patch) | |
| tree | 59b7516acb7a583b5938d2ac91efaf64f8f4ca13 /tools/aapt2/java/JavaClassGenerator_test.cpp | |
| parent | f90f5aacd1d6a5fc3927ff2e441bd00a61608088 (diff) | |
| parent | 56e2b96ef78666bd4a1c95a14638b19258fb1dc6 (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
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11700786
Change-Id: I237ac4e555b6659b61f0b1f462ada1b1f1c6e0ab
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions