summaryrefslogtreecommitdiff
path: root/tools/aapt2/diff/Diff.cpp
diff options
context:
space:
mode:
authorIvan Podogov <ginkage@google.com>2017-01-03 11:17:45 +0000
committerandroid-build-merger <android-build-merger@google.com>2017-01-03 11:17:45 +0000
commit171af67a69c630830d7c0df045bf3490eaf24ae0 (patch)
tree7774f4bf1a0986b05bef965ce62ab1cc2f9c1dfb /tools/aapt2/diff/Diff.cpp
parentbf3e5249763ab8ae11f687a3f1e532fea5293375 (diff)
parent2dd60e81ada206abad107b88c404f6d9a62cdfde (diff)
Merge "In permission review mode, always request user's consent to toggle BT." into cw-f-dev am: 34624a5d83
am: 2dd60e81ad Change-Id: Ie0b2f16368d5d6d1d12a140bf57049ae29c7b84f
Diffstat (limited to 'tools/aapt2/diff/Diff.cpp')
0 files changed, 0 insertions, 0 deletions