summaryrefslogtreecommitdiff
path: root/tools/aapt2/diff/Diff.cpp
diff options
context:
space:
mode:
authorltrochtova <ltrochtova@google.com>2017-01-26 10:04:30 +0000
committerandroid-build-merger <android-build-merger@google.com>2017-01-26 10:04:30 +0000
commit68945f3d11b3d731df81613e6c1e9a08c560e550 (patch)
treef787c70c550aec25cfc421fbacf018d28e7289ec /tools/aapt2/diff/Diff.cpp
parenta8affd9e831d4caaf59095a65466eb161b8cbb61 (diff)
parenta0f229263a624e4bfad234a15c6a8a1574530e9e (diff)
Merge "Don't offer the BT sharing option to the user if BT is disallowed." am: 2c1e396382 am: c0118ac10e am: 3db1ff462a
am: a0f229263a Change-Id: Iccc3f7679e2d400f683d43c3d612197fba402f33
Diffstat (limited to 'tools/aapt2/diff/Diff.cpp')
0 files changed, 0 insertions, 0 deletions