diff options
| author | TreeHugger Robot <treehugger-gerrit@google.com> | 2020-06-23 06:06:58 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-06-23 06:06:58 +0000 |
| commit | a497573a6ada73ce38320bdc92d96b0f440ea2a9 (patch) | |
| tree | dac609f5386ea032f8ccc7e7df22199443076864 /tools/aapt2/java/JavaClassGenerator_test.cpp | |
| parent | 6538964ef35d212fc80ec9dcb387e278a6c0521d (diff) | |
| parent | 804342e8365b8bb6241c7b0e72332bf3a2be62da (diff) | |
[automerger skipped] Merge "Stop sharing ProximitySensor in Doze code." into rvc-dev am: a48f9637b7 -s ours am: 101a86f37d -s ours am: 804342e836 -s ours
am skip reason: Change-Id I0c5927f102237c57e9e50bc46ba7ebcb7fb79cec with SHA-1 52d801e4d7 is in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11958657
Change-Id: Ifa9afc6f4358c42b98cc93c2fec07a0051f6066a
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions