OSDN Git Service

(root) / android-x86 / frameworks-base.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 199f6a4 47da8a0)
Merge \\\\"DO NOT MERGE: Add pm operation to set user restrictions.\\\\" into lmp...
authorSudheer Shanka <sudheersai@google.com>
Tue, 21 Jun 2016 22:36:46 +0000 (22:36 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Tue, 21 Jun 2016 22:36:46 +0000 (22:36 +0000)
am: 47da8a0bdc  -s ours

Change-Id: Idf654d72b81e9f4c4219f2b7a5f14ba3be021438


Trivial merge
frameworks/base
About OSDN
Find Software
Develop Software
Help