diff options
| author | TreeHugger Robot <treehugger-gerrit@google.com> | 2020-06-23 06:07:36 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-06-23 06:07:36 +0000 |
| commit | a9f791b978c5ba936dad20386e6515fba134da74 (patch) | |
| tree | dac609f5386ea032f8ccc7e7df22199443076864 /tools/aapt2/java/JavaClassGenerator_test.cpp | |
| parent | 68b25745ca0fe936504cf748561e9624219635a6 (diff) | |
| parent | 6fb2d9ec89a853738a69dd7a54685015f8316a47 (diff) | |
[automerger skipped] Merge "Stop sharing ProximitySensor in Doze code." into rvc-dev am: a48f9637b7 am: 23b19caa90 -s ours am: 6fb2d9ec89 -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: I890f9695cf706d6f6e2eec777856b6be1d8d1f60
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions