diff options
| author | Mohammad Samiul Islam <samiul@google.com> | 2020-07-10 20:40:24 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-07-10 20:40:24 +0000 |
| commit | 94d217b51c954af45c2b76ceca8ae31fcab2942e (patch) | |
| tree | 1e8a46b8318aaa1b3d3da1e88af2c577592a6e77 /tools/aapt2/java/JavaClassGenerator_test.cpp | |
| parent | 32dd36d794a9f3e14a230829bb3ee126874a2831 (diff) | |
| parent | 77eed1c52940a1a1db86be58d329863bb8e624e8 (diff) | |
[automerger skipped] Merge "Fix deadlock in StagingManager.getSessions() method" into rvc-dev am: c25a56caed am: 55662925ea am: 77c6e91632 -s ours am: 77eed1c529 -s ours
am skip reason: Change-Id I7a1abf44db27d4673d43e9b0886610a5bd8b41f6 with SHA-1 3aa1f5aa16 is in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12117348
Change-Id: Ieef121f05364826cb1c37b85843ddb268956c566
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions