summaryrefslogtreecommitdiff
path: root/tools/aapt2/diff/Diff.cpp
diff options
context:
space:
mode:
authorSudheer Shanka <sudheersai@google.com>2016-08-30 17:59:17 +0000
committerandroid-build-merger <android-build-merger@google.com>2016-08-30 17:59:17 +0000
commit26fa6328b8c09d52fc564e717bf246fce5be5387 (patch)
tree00cc6ba9ad3403fed67fd76d7440dac5c621bc3c /tools/aapt2/diff/Diff.cpp
parent0be41fc1a965c94b26c596f352ad095135b255ee (diff)
parent65ce524bdefcfb4a967f5e87155b8920662b3207 (diff)
Merge "Allow apps with CREATE_USERS permission to create demo users." into nyc-mr1-dev
am: 65ce524bde Change-Id: I8c6844cbb109dee8d7b6c72763674c3f4702a288
Diffstat (limited to 'tools/aapt2/diff/Diff.cpp')
0 files changed, 0 insertions, 0 deletions