diff options
| author | TreeHugger Robot <treehugger-gerrit@google.com> | 2020-06-23 05:54:24 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-06-23 05:54:24 +0000 |
| commit | 804342e8365b8bb6241c7b0e72332bf3a2be62da (patch) | |
| tree | dac609f5386ea032f8ccc7e7df22199443076864 /tools/aapt2/java/JavaClassGenerator_test.cpp | |
| parent | 83e688f8a77b083daa95f46b674ef6620cd5e378 (diff) | |
| parent | 101a86f37df181e4c628a588925acb047be2af59 (diff) | |
[automerger skipped] Merge "Stop sharing ProximitySensor in Doze code." into rvc-dev am: a48f9637b7 -s ours am: 101a86f37d -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: Ia900a370f8e3c77afdbc4a23c0e6f7fc8db5ef0b
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions