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