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