diff options
| author | Dave Mankoff <mankoff@google.com> | 2020-05-19 02:16:12 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-05-19 02:16:12 +0000 |
| commit | 66448c6d98e59d355276a693bc5246a8403aa9a7 (patch) | |
| tree | a61dcc034410f08c8a04d1a99ea17ce660230612 /tools/aapt2/java/JavaClassGenerator_test.cpp | |
| parent | b42d2ff00d29cecc22b7201dca46b97f5487ebd2 (diff) | |
| parent | 015d5fa4b247eaf510d4fa5074a9a29be3facda0 (diff) | |
Merge "Don't turn on prox until after screen is off/dozed" into rvc-d1-dev am: 6f718bba6f am: e0f73f7e40 am: 015d5fa4b2
Change-Id: I84b4b4febe7356399d10f5fd08bdc23d4d2f5511
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions