summaryrefslogtreecommitdiff
path: root/tools/aapt2/diff/Diff.cpp
diff options
context:
space:
mode:
authorYohei Yukawa <yukawa@google.com>2016-06-27 20:30:49 +0000
committerandroid-build-merger <android-build-merger@google.com>2016-06-27 20:30:49 +0000
commitbadcecb2aaa996828af02cc1a0e01f869df12a2d (patch)
tree3ced7a8872fc1c4514c8e2f29358bccaa184ef75 /tools/aapt2/diff/Diff.cpp
parent33ffd531bdd13ade7bfe4cf37d05131089ee0213 (diff)
parentcb56978912772a8e3d741b643ad1e491c97af22f (diff)
Merge \"Use a flag to grant a temporary URI permission.\" into nyc-mr1-dev
am: cb56978912 Change-Id: I20e1481c6f68a5af4f33e699f5bc505b3a4c1457
Diffstat (limited to 'tools/aapt2/diff/Diff.cpp')
0 files changed, 0 insertions, 0 deletions