diff options
| author | Chong Zhang <chz@google.com> | 2016-08-12 00:57:02 +0000 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2016-08-12 00:57:02 +0000 |
| commit | c3e2694eb553bd84ea3873dcb32f22d8b913b38a (patch) | |
| tree | 574d2def7e8e4ae9a761434c15e5a68be659918d /tools/aapt2/diff/Diff.cpp | |
| parent | 61bc404c0c35bcd68cba0dcca917dd9f4bd24a86 (diff) | |
| parent | 74670684d43154ea82d7a31cb29002650c2fcd1f (diff) | |
Merge "Allow to keep screen on only if window can be seen" into nyc-mr1-dev am: 305d610fd8
am: 74670684d4
Change-Id: I5480cd6b338a25e97712d94464bf6b03237cfff9
Diffstat (limited to 'tools/aapt2/diff/Diff.cpp')
0 files changed, 0 insertions, 0 deletions