summaryrefslogtreecommitdiff
path: root/tools/aapt2/diff/Diff.cpp
diff options
context:
space:
mode:
authorSid Soundararajan <ssoundar@google.com>2016-06-29 20:13:54 +0000
committerandroid-build-merger <android-build-merger@google.com>2016-06-29 20:13:54 +0000
commitaea3d63f852562a6b981b4ac5744560a9fb34e14 (patch)
tree14bcaa8ed10b228991fc9b1689bbf901db418da7 /tools/aapt2/diff/Diff.cpp
parenta75526bd117a0dbfb9793392cb7d28621829311c (diff)
parent10b2fee05f3704ee65cd3730c3d0e2cdb5ac26e2 (diff)
Merge \"Recents: Make sure blacklist checks the package name as well as activity name\" into nyc-dev
am: 10b2fee05f Change-Id: If4ddf850d2be037d50a7aa3ddbce040c7ad4b7cd
Diffstat (limited to 'tools/aapt2/diff/Diff.cpp')
0 files changed, 0 insertions, 0 deletions