diff options
| author | Lucas Dupin <dupin@google.com> | 2020-07-21 00:49:43 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-07-21 00:49:43 +0000 |
| commit | cf0396877a67d1133933a0b876565086e1d6c29e (patch) | |
| tree | 2270995055ccfe256572c386e2c3a3be282647ec /tools/aapt2/java/JavaClassGenerator_test.cpp | |
| parent | 0441a937ac275df92018d86106b7703f49900252 (diff) | |
| parent | 7e387342d61a210c58174ce8664733a261e2138a (diff) | |
Merge "Don't turn on prox when wirelessly charging." into rvc-d1-dev am: 7e387342d6
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12193436
Change-Id: I872c16de139d1c096d75da659a33d9269afa765c
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions