diff options
author | Sarah Chin <sarahchin@google.com> | 2021-01-21 23:54:15 +0000 |
---|---|---|
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2021-01-21 23:54:15 +0000 |
commit | 60ddcd208c4aab528dd767726cd8fa82fa839d24 (patch) | |
tree | bc543e22cd0a2dcf6ba4d249caab4619de051146 /tools/aapt2/java/JavaClassGenerator_test.cpp | |
parent | c21c984019015d5ae4fcd9d4490b2d82ee0ad908 (diff) | |
parent | 871566afabf7b56c6466aa228e2276b3bb99764c (diff) |
[automerger skipped] Merge "Update TelephonyDisplayInfo docs" am: a906fd5e14 am: 90b6c9def0 am: 871566afab -s ours
am skip reason: Change-Id Ia59efcf68c77d79be1a223f9fd6cbf3ec333478a with SHA-1 b4be4c8be3 is in history
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1557000
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I3840d17e28b911856f05f093a6e91e8cca2cc674
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions