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