diff options
| author | Tianjie Xu <xunchang@google.com> | 2021-01-15 02:15:19 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2021-01-15 02:15:19 +0000 |
| commit | 48824f7edeef72a0089c90b6ed3248d28f947673 (patch) | |
| tree | bfee6d3b99e14d0963c3dabd65511ca47d65e570 /tools/aapt2/java/JavaClassGenerator_test.cpp | |
| parent | e742d9edc91d1c79a6da3e5b521143a2e1d6dc95 (diff) | |
| parent | e013e0b98a4fa3d578e4652871b0cf6b1834ca90 (diff) | |
Merge "Do not remove the k_k until all users are unlocked" am: 4d20410bf4 am: e013e0b98a
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1550295
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: Iec8191cf30a4977d234c83156bfac0b0edf344cf
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions