diff options
| author | Lucas Dupin <dupin@google.com> | 2020-07-21 00:48:06 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-07-21 00:48:06 +0000 |
| commit | c8b62b40b6678da40109bdc9438589e378d5c888 (patch) | |
| tree | 725e259d01d72ca0ab7beac76466b16d8f3119c8 /tools/aapt2/java/JavaClassGenerator.cpp | |
| parent | 2b804093067cea945546f9805d2fefdffc4698b3 (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: I618fa0be7b4534616b58ea1f79f10c281318018f
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator.cpp')
0 files changed, 0 insertions, 0 deletions