diff options
author | bsears <bsears@google.com> | 2019-07-23 22:11:05 -0700 |
---|---|---|
committer | android-build-merger <android-build-merger@google.com> | 2019-07-23 22:11:05 -0700 |
commit | 4d1c56c7fdfb08c02e853e3d1157bb47cfcd0dc2 (patch) | |
tree | dab1af300bd515193302e0236ef8955aa2965eec /tools/aapt2/java/JavaClassGenerator_test.cpp | |
parent | b407594222fa22a8fc461a13bd1546cc93d633ee (diff) | |
parent | c7067c4d5d44946d69bc3a96ef75f9a80000e8be (diff) |
[automerger skipped] Merge "Don't animate clock when turning screen off." into qt-dev am: 486503c74e -s ours
am: c7067c4d5d -s ours
am skip reason: change_id If39777340b72bc623d6690bc4f784c7f5c26ea8d with SHA1 dc8fee7ea1 is in history
Change-Id: Ie6ad69384732c2d9bee2a7bee7291639565de670
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions