diff options
| author | Andrii Kulian <akulian@google.com> | 2017-05-26 23:25:23 +0000 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2017-05-26 23:25:23 +0000 |
| commit | 83876c735ef8c6bb205cac27a8ce74e2c957f2bf (patch) | |
| tree | 94f899130123029c0ea57b89f500bcec08f7a0c1 /tools/aapt2/java/JavaClassGenerator_test.cpp | |
| parent | 8546ca67da9dd59c93aae8baad61dec4de0e1a45 (diff) | |
| parent | e63965cef516777dae682103e0813b7f024dab62 (diff) | |
Merge "Refresh screen off timeout when screen lock is released in VR" into oc-dev
am: e63965cef5
Change-Id: If1e6876fa6466fa047213f6f1ebbb42d004486f0
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions