diff options
| author | TreeHugger Robot <treehugger-gerrit@google.com> | 2020-07-15 14:55:30 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-07-15 14:55:30 +0000 |
| commit | c48aa55c1873bc970ab0399023331cff6c1a54a0 (patch) | |
| tree | efecfc99123970b9afbaf835c5c65a0af02693c8 /tools/aapt2/java/JavaClassGenerator_test.cpp | |
| parent | 40de8d567643028733cd2d6ea36841c6f209d2dd (diff) | |
| parent | 79a5c2bf1a9fba6230f1f9fd7e69638827232357 (diff) | |
[automerger skipped] Merge "Skip resuming activities on sleeping display" into rvc-qpr-dev am: 982735658a am: 79a5c2bf1a -s ours
am skip reason: Change-Id I7f08e09fb9273a3ae7855728ed6f4eb1b7fdb206 with SHA-1 329c60d4af is in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12122880
Change-Id: I3df05963c52fb998c30b35fce6b5862dd3a60d7f
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions