diff options
author | Tianjie Xu <xunchang@google.com> | 2020-12-15 01:09:23 +0000 |
---|---|---|
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-12-15 01:09:23 +0000 |
commit | 6213dbfc116ba3e2ea5a8eaf30081354f998447d (patch) | |
tree | d397f554bd38448cebb2a46681f7a9774e3a5cd4 /tools/aapt2/java/JavaClassGenerator_test.cpp | |
parent | a004868b99da0f9cf935973b3c29066bde6560db (diff) | |
parent | 56afaf2c18dd605a35fc11bf3ee7cdcfb054c78d (diff) |
Merge "Update the OWNERS file for locksettings" am: 14e70a6510 am: 25ebb2bea4 am: 56afaf2c18
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1528859
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: Ied7a9bd35d64e1914607c623152d0162d85ecb40
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions