summaryrefslogtreecommitdiff
path: root/tools/aapt2/diff/Diff.cpp
diff options
context:
space:
mode:
authorJulius D'souza <jdsouza@google.com>2016-10-21 22:37:04 +0000
committerandroid-build-merger <android-build-merger@google.com>2016-10-21 22:37:04 +0000
commit38405b69d27c3fdc81c97ddc82a24fec04ccd9ca (patch)
tree963c67fef5790e2b6458d465fa35b56d65454c3b /tools/aapt2/diff/Diff.cpp
parent0085ce0513ddfb05e05ad1012f30b96b69fbb830 (diff)
parenta39e64eac2b816c43b2abf86d5db779df5a560b8 (diff)
Merge "DO NOT MERGE: Disable dim brightness reset when using ALS-based doze" into cw-f-dev
am: a39e64eac2 Change-Id: I76a3334bd1464d9d8591f4bf1bbe369d90753d5e
Diffstat (limited to 'tools/aapt2/diff/Diff.cpp')
0 files changed, 0 insertions, 0 deletions