diff options
| author | Adam Lesinski <adamlesinski@google.com> | 2016-02-22 19:53:54 +0000 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2016-02-22 19:53:54 +0000 |
| commit | 209d706d2b5965d189a532edc0e70f75be4e0141 (patch) | |
| tree | 8736c2fb2ce4fe516797bb80f0976a85b148e4b0 /tools/aapt2/java/JavaClassGenerator_test.cpp | |
| parent | f2629d481e19e43235ea4546ab53443fbd432988 (diff) | |
| parent | 5c918ee029276efe090e82086fd4089d7686e60f (diff) | |
Merge "DO NOT MERGE ANYWHERE: Don\'t change screen on time on time changes" into mnc-dr-dev am: 3e439db8c8 -s ours am: 83fd156e21 -s ours
am: 5c918ee029 -s ours
* commit '5c918ee029276efe090e82086fd4089d7686e60f':
DO NOT MERGE ANYWHERE: Don't change screen on time on time changes
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions