diff options
| author | Treehugger Robot <treehugger-gerrit@google.com> | 2021-01-28 17:14:16 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2021-01-28 17:14:16 +0000 |
| commit | 1adabc4378f0b4b21cea24516daadb4a1e3614f9 (patch) | |
| tree | 3026831244536805615b9df36f5e3a5bd332a1a6 /tools/aapt2/java/JavaClassGenerator_test.cpp | |
| parent | a9e4ebec104a4566da61f5fe35abe01c6ca5448a (diff) | |
| parent | bdef0ad3bc4c52e9c5b9cd019082b52d81949a52 (diff) | |
[automerger skipped] Merge "DO NOT MERGE Fix CEC read Global Setting timing" am: 7e69b0a93d am: c0c9dbfc2f am: bdef0ad3bc -s ours
am skip reason: subject contains skip directive
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1537562
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I39e00944462e47dfa36482737ffefbd4d930942e
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions