summaryrefslogtreecommitdiff
path: root/tools/aapt2/diff/Diff.cpp
diff options
context:
space:
mode:
authorJulius D'souza <jdsouza@google.com>2016-10-13 08:01:38 +0000
committerandroid-build-merger <android-build-merger@google.com>2016-10-13 08:01:38 +0000
commit85730569b129ce36117dabb580c1489931e20fa7 (patch)
treea112366b513c5e6f3b1b6db1a272b709faab095e /tools/aapt2/diff/Diff.cpp
parent6e29e8e57015a2512e9793e2f16e283dd4555adf (diff)
parent1e42c73f13bdcca50f3aa446c0e2adbc81565668 (diff)
Merge "DO NOT MERGE: Ambient light sensor changes for doze mode." into cw-f-dev am: 0dcdae30cf
am: 1e42c73f13 -s ours Change-Id: Ic9b19be3cb2035b956d8ad6669b841a38c718ac4
Diffstat (limited to 'tools/aapt2/diff/Diff.cpp')
0 files changed, 0 insertions, 0 deletions