OSDN Git Service

(root) / android-x86 / frameworks-base.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 09ffc82 3c4d9c5)
am 169ebe98: Merge "Adds an enabled state in UserInfo instead of DevicePolicyManager"
authorAlexandra Gherghina <alexgherghina@google.com>
Thu, 1 May 2014 10:52:32 +0000 (10:52 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Thu, 1 May 2014 10:52:32 +0000 (10:52 +0000)
* commit '169ebe98aeb8d1f725208da92585bc7a7a99aff8':
  Adds an enabled state in UserInfo instead of DevicePolicyManager


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