diff options
author | Chong Zhang <chz@google.com> | 2016-08-12 00:52:17 +0000 |
---|---|---|
committer | android-build-merger <android-build-merger@google.com> | 2016-08-12 00:52:17 +0000 |
commit | 74670684d43154ea82d7a31cb29002650c2fcd1f (patch) | |
tree | 645ce43156674b4fc042e09a6f69c1a69ebd7761 /tools/aapt2/java/JavaClassGenerator_test.cpp | |
parent | 19353b45e5145daa7415a91540666dc2fe2a0e12 (diff) | |
parent | 305d610fd893ed838089130e0a4e1e6fea5e01ce (diff) |
Merge "Allow to keep screen on only if window can be seen" into nyc-mr1-dev
am: 305d610fd8
Change-Id: Ib3d0beeed54a52b1185456b0c859859c61548d50
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions