OSDN Git Service

am 9bf7be93: Merge "Add permission check for owner-info related LockSettings." into...
authorJim Miller <jaggies@google.com>
Wed, 17 Apr 2013 22:49:23 +0000 (15:49 -0700)
committerAndroid Git Automerger <android-git-automerger@android.com>
Wed, 17 Apr 2013 22:49:23 +0000 (15:49 -0700)
* commit '9bf7be933d039ef227ca54f917c1ff6a00a2f833':
  Add permission check for owner-info related LockSettings.


Trivial merge