diff options
| author | Chris Tate <ctate@android.com> | 2020-06-03 23:18:12 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-06-03 23:18:12 +0000 |
| commit | d3be1f437305a63aaa42ab1d814c266f5014ff01 (patch) | |
| tree | 5f756d574b463c36bf093894138de09b5c34d23f /tools/aapt2/java/JavaClassGenerator_test.cpp | |
| parent | 0682ead4cf0631c69a712ebc617fd59dcde4a404 (diff) | |
| parent | 4b2c657cfa57c80b5f1d50c6a30030072e3fb574 (diff) | |
[automerger skipped] Merge "More fixes towards the race conditions in AMS" into oc-mr1-dev am: 239ab1c9d6 -s ours am: 03f7e9d6fc -s ours am: f0a0963d1d -s ours am: 44654288c0 -s ours am: 60312c6aa1 -s ours am: 82dccdbec8 -s ours am: 4b2c657cfa -s ours
am skip reason: Change-Id I6e0bdc8c02bab54f6278096b3a3acadd97c064c6 with SHA-1 9450069de9 is in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11602836
Change-Id: Id61a5b19a84c5e534a68a8a4bac2d4e942ca56d3
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions