summaryrefslogtreecommitdiff
path: root/tools/aapt2/diff/Diff.cpp
diff options
context:
space:
mode:
authorSudheer Shanka <sudheersai@google.com>2016-06-20 22:49:34 +0000
committerandroid-build-merger <android-build-merger@google.com>2016-06-20 22:49:34 +0000
commit2050cfd7bac43205763463d10c315bb1d3fe9219 (patch)
tree22981b865d837b0c3ceda238c2042df40538b10e /tools/aapt2/diff/Diff.cpp
parentbceacc42a27363d3a32d0a982feff5ca04f65f45 (diff)
parentf00e7804727c3cadb44068583b73e59347bac6db (diff)
Merge \"Allow call addSharedAccountsFromParentUser with CREATE_USERS permission.\" into nyc-dev
am: f00e780472 Change-Id: I542e11688a52dd3cde8fd8c3df252b2ead0e5240
Diffstat (limited to 'tools/aapt2/diff/Diff.cpp')
0 files changed, 0 insertions, 0 deletions