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