summaryrefslogtreecommitdiff
path: root/tools/aapt2/diff/Diff.cpp
diff options
context:
space:
mode:
authorAndroid Build Merger (Role) <android-build-merger@google.com>2016-06-28 20:49:12 +0000
committerAndroid (Google) Code Review <android-gerrit@google.com>2016-06-28 20:49:14 +0000
commitb1400b142e01ea95bcfde24efbc9d564ce9146b6 (patch)
tree78e267fa2853f6d1ea590efab435d3c3b85f2f5f /tools/aapt2/diff/Diff.cpp
parent23bc74a8d5c9086b3bddccc4b7554840e585fced (diff)
parent1cec26c69e5ecd33d634996b05db8b0b3467b9f0 (diff)
Merge "Merge \"Remove redundant setPendingIntentWhitelistDuration() calls.\" into nyc-dev am: c1374208e3" into nyc-mr1-dev
Diffstat (limited to 'tools/aapt2/diff/Diff.cpp')
0 files changed, 0 insertions, 0 deletions