diff options
| author | Adam Lesinski <adamlesinski@google.com> | 2016-02-22 19:42:04 +0000 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2016-02-22 19:42:04 +0000 |
| commit | 5c918ee029276efe090e82086fd4089d7686e60f (patch) | |
| tree | 6a9d2a8ea7aab43a9b05a0d2bf452e93d911dca3 /tools/aapt2/java/JavaClassGenerator_test.cpp | |
| parent | 08f781bd8215d452cd2761f69889a69d1a736ea7 (diff) | |
| parent | 83fd156e2173ff65fd8afdaca1ccd20fc91a5d33 (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
* commit '83fd156e2173ff65fd8afdaca1ccd20fc91a5d33':
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