summaryrefslogtreecommitdiff
path: root/tools/aapt2/diff/Diff.cpp
diff options
context:
space:
mode:
authorJulia Reynolds <juliacr@google.com>2015-08-06 14:01:40 +0000
committerAndroid Git Automerger <android-git-automerger@android.com>2015-08-06 14:01:40 +0000
commit4b74d6693e2ea7248de79332a020672ece19b100 (patch)
tree5635d15ab8627ec6b73db142259677515858d832 /tools/aapt2/diff/Diff.cpp
parentecbd1cef9cf884f5d34ea36baa1c1496a48751ec (diff)
parent48d146c9d66abd3002a8bc6b7245e4c34b6fcff5 (diff)
am 48d146c9: am c694ab32: am a3b5a612: Merge "Store ringer mode on entering DND mode so it can be restored on exit." into mnc-dev
* commit '48d146c9d66abd3002a8bc6b7245e4c34b6fcff5': Store ringer mode on entering DND mode so it can be restored on exit.
Diffstat (limited to 'tools/aapt2/diff/Diff.cpp')
0 files changed, 0 insertions, 0 deletions