diff options
| author | TreeHugger Robot <treehugger-gerrit@google.com> | 2020-06-23 05:42:33 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-06-23 05:42:33 +0000 |
| commit | 101a86f37df181e4c628a588925acb047be2af59 (patch) | |
| tree | ca42d09dc58f8c6848e218e3209b1905064d6fcf /tools/aapt2/java/JavaClassGenerator.cpp | |
| parent | 90be90c598f70116ce9b0fa4e4cc1af1819bbcfc (diff) | |
| parent | a48f9637b7e75afc5f5d3f74eee2d9020e315a24 (diff) | |
[automerger skipped] Merge "Stop sharing ProximitySensor in Doze code." into rvc-dev am: a48f9637b7 -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: I9c9a7d70340ed9444f9064cde502b71b2c659604
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator.cpp')
0 files changed, 0 insertions, 0 deletions