summaryrefslogtreecommitdiff
path: root/tools/aapt2/diff/Diff.cpp
diff options
context:
space:
mode:
authorSudheer Shanka <sudheersai@google.com>2016-06-16 22:37:38 +0000
committerandroid-build-merger <android-build-merger@google.com>2016-06-16 22:37:38 +0000
commite1eb4cd0e74e0908547b48712dde5ecf0909cbc3 (patch)
treece96b4d06a8188cf9f9c728fcc1588c247b650ac /tools/aapt2/diff/Diff.cpp
parent3f258857b5f3cee671a6b37b1fce6682102b018e (diff)
parent48ee87d4a7e6a1f9127875fd4ecf99f62d1faedb (diff)
Merge \"Allow apps with CREATE_USERS permission to create restricted users.\" into nyc-dev
am: 48ee87d4a7 Change-Id: Ib61fe36aef8fc992e87ccaa692cc2712caf36570
Diffstat (limited to 'tools/aapt2/diff/Diff.cpp')
0 files changed, 0 insertions, 0 deletions