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