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