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