OSDN Git Service

(root) / android-x86 / frameworks-base.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: ff1005a 250bb6e)
am b5b77c47: Merge "Allow profile owners to set user restrictions"
authorAmith Yamasani <yamasani@google.com>
Fri, 25 Apr 2014 18:28:25 +0000 (18:28 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Fri, 25 Apr 2014 18:28:25 +0000 (18:28 +0000)
* commit 'b5b77c47c4dc41b75e73b42378d3c63647ac4fd0':
  Allow profile owners to set user restrictions

1  2 
api/current.txt patch | diff1 | diff2 | blob | history

diff --cc api/current.txt
Simple merge
frameworks/base
About OSDN
Find Software
Develop Software
Help