summaryrefslogtreecommitdiff
path: root/tools/aapt2/diff/Diff.cpp
diff options
context:
space:
mode:
authorAndroid Build Merger (Role) <android-build-merger@google.com>2017-02-12 10:21:33 +0000
committerAndroid (Google) Code Review <android-gerrit@google.com>2017-02-12 10:21:37 +0000
commit09b336febd1925fe52bb4268b29902712e660d27 (patch)
tree9771853fafcda0dd76a000c2a533e0c7affb1aa5 /tools/aapt2/diff/Diff.cpp
parentce567aa642c330d98c52e39461e115648d37dc6b (diff)
parent4f86c07a3e3c8a3347e9769ebddd9d2fe93aa101 (diff)
Merge "DO NOT MERGE. Grant MMS Uri permissions as the calling UID. am: 3f3da42ef9 am: 32c71b078c am: 75f767afa1 am: 502ee22a9d -s ours am: deea677359 am: 853e178de4 am: c7b754f62b am: 86f242b071 am: d491410316" into nyc-mr2-dev-plus-aosp
Diffstat (limited to 'tools/aapt2/diff/Diff.cpp')
0 files changed, 0 insertions, 0 deletions