summaryrefslogtreecommitdiff
path: root/tools/aapt2/diff/Diff.cpp
diff options
context:
space:
mode:
authorSudheer Shanka <sudheersai@google.com>2016-06-20 23:00:03 +0000
committerandroid-build-merger <android-build-merger@google.com>2016-06-20 23:00:03 +0000
commit5eeb1dd44af6623a9e223b2c87c5501c979d9c93 (patch)
tree90311d89587ecf60a596143b26ca3d15c867f606 /tools/aapt2/diff/Diff.cpp
parent09158ad359ee4b94602fd32272f1a5d2396e2de6 (diff)
parent8ecf1e52bab6025f20df4161712a123b8aaf74dc (diff)
Merge \\\"Allow call addSharedAccountsFromParentUser with CREATE_USERS permission.\\\" into nyc-dev am: f00e780472 am: 7aecaf8d52
am: 8ecf1e52ba Change-Id: Ic63f937457b39d56f1ac79adc082efc2196e429b
Diffstat (limited to 'tools/aapt2/diff/Diff.cpp')
0 files changed, 0 insertions, 0 deletions