diff options
| author | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-02-20 15:11:19 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-02-20 15:11:19 +0000 |
| commit | 253b363623ddf4ed7e11b7e33e553872354f5d32 (patch) | |
| tree | f3e13eb086a9e6c9fbc54bbe5bce67fa0855d326 /tools/aapt2/java/JavaClassGenerator_test.cpp | |
| parent | 9c71f18549decf4fc35f27ddd03e35c749bb1251 (diff) | |
| parent | 7e6457334fa4c84c9b60c3f4dea3f2eaffe9768b (diff) | |
[automerger skipped] Merge "RESTRICT AUTOMERGE Use Alternative Prox Sensor for Falsing" into qt-qpr1-dev am: 8161bd3ab6 am: 7e6457334f -s ours
am skip reason: subject contains skip directive
Change-Id: Ibba07335e72ce19c0dd1631c24630a59b4dc08ce
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions