diff options
| author | TreeHugger Robot <treehugger-gerrit@google.com> | 2020-06-23 05:54:15 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-06-23 05:54:15 +0000 |
| commit | 871ead3d190a1df38e4157e6ff9f0f80b63029a7 (patch) | |
| tree | f3e4ab8b17b686645721b415058e5a642cb6e715 /tools/aapt2/java/JavaClassGenerator_test.cpp | |
| parent | d182112572f88aa3ef4b1d51ecc5968d9eab1898 (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: Ia9807ffdd58408fb58925ca498a9f8e3369d2b0d
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions