diff options
author | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2021-02-04 01:13:06 +0000 |
---|---|---|
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2021-02-04 01:13:06 +0000 |
commit | 9ec1bb63e392138832e09562b15ed1f2ebbca0de (patch) | |
tree | c1961b6b931dbe1a6c5c4b7665701770eb313b43 /tools/aapt2/java/JavaClassGenerator_test.cpp | |
parent | e46b83026ebce2da0b40a4a1b2ebe67beaa9fe2b (diff) | |
parent | 407c766a8b30b3c2c4111de7b61494218247e9c2 (diff) |
Merge "Merge "Adding SimPhonebookContract" am: 110420fcae" into stage-aosp-master am: f306fb9957 am: 407c766a8b
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1521063
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I0a79292e10c3e63cccf4e8cc1f077ddce78fb858
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions