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