summaryrefslogtreecommitdiff
path: root/tools/aapt2/diff/Diff.cpp
diff options
context:
space:
mode:
authorltrochtova <ltrochtova@google.com>2017-01-26 09:58:53 +0000
committerandroid-build-merger <android-build-merger@google.com>2017-01-26 09:58:53 +0000
commita0f229263a624e4bfad234a15c6a8a1574530e9e (patch)
treeefa35f21de265198e870dc49f3a413d4c1344c18 /tools/aapt2/diff/Diff.cpp
parent4ad5263a52f5c2c2c0814bdd2d036855219000e7 (diff)
parent3db1ff462ab9394bef1e0a2e0904fa47fcb330f4 (diff)
Merge "Don't offer the BT sharing option to the user if BT is disallowed." am: 2c1e396382 am: c0118ac10e
am: 3db1ff462a Change-Id: I846e7d5b84fb953f93256c8c6d2ca18d37199f1f
Diffstat (limited to 'tools/aapt2/diff/Diff.cpp')
0 files changed, 0 insertions, 0 deletions