summaryrefslogtreecommitdiff
path: root/tools/aapt2/diff/Diff.cpp
diff options
context:
space:
mode:
authorSudheer Shanka <sudheersai@google.com>2016-06-20 22:52:32 +0000
committerandroid-build-merger <android-build-merger@google.com>2016-06-20 22:52:32 +0000
commit90483c4e2140a329893e7d0f504a456a0ff4c649 (patch)
tree95c3a490da46afc5738213f5d7935198c62c4dbb /tools/aapt2/diff/Diff.cpp
parent02221a33491486f2a417e9253829969eaf990828 (diff)
parent2050cfd7bac43205763463d10c315bb1d3fe9219 (diff)
Merge \\"Allow call addSharedAccountsFromParentUser with CREATE_USERS permission.\\" into nyc-dev am: f00e780472
am: 2050cfd7ba Change-Id: I52bf33ff9a31e716bf1b1ac289e3115d0fc47ed5
Diffstat (limited to 'tools/aapt2/diff/Diff.cpp')
0 files changed, 0 insertions, 0 deletions