diff options
author | Mohammad Samiul Islam <samiul@google.com> | 2020-07-10 20:40:55 +0000 |
---|---|---|
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-07-10 20:40:55 +0000 |
commit | e38e8b935518e0d833d75fc328d73be789cd2119 (patch) | |
tree | 1e8a46b8318aaa1b3d3da1e88af2c577592a6e77 /tools/aapt2/java/JavaClassGenerator.cpp | |
parent | 94d217b51c954af45c2b76ceca8ae31fcab2942e (diff) | |
parent | c34910d080d5a29ffca3e70508236ecebdf7a1da (diff) |
[automerger skipped] Merge "Fix deadlock in StagingManager.getSessions() method" into rvc-dev am: c25a56caed am: 2ebf7b3667 -s ours am: db81db11c6 -s ours am: c34910d080 -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: I7c746fae2c3dbaabf3408f7cb61fd3cd73bf0d14
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator.cpp')
0 files changed, 0 insertions, 0 deletions