diff options
author | Adrian Roos <roosa@google.com> | 2017-07-26 17:47:00 +0000 |
---|---|---|
committer | android-build-merger <android-build-merger@google.com> | 2017-07-26 17:47:00 +0000 |
commit | 218e3b75faf0c469ed5f43d6b665d9cdbbaaa431 (patch) | |
tree | 94a5f00a83cf003efa8982bc4c09cf9c6fd5e509 /tools/aapt2/java/JavaClassGenerator_test.cpp | |
parent | be3ec0426917fb8e3a8e87ef5a0fff6e2fac8521 (diff) | |
parent | f3ca2bfd8c1ffc45bb7b7d8e37c8eac4b1ba86e5 (diff) |
Merge "Merge "AOD: Only force doze brightness when actually unlocking" into oc-dr1-dev am: afda883f86 am: 2168aff878" into oc-mr1-dev-plus-aosp
am: f3ca2bfd8c
Change-Id: I38c8bb15b78648102f813079c1a0ece9ac7eed83
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions