| commit | 6825c478304e37c13e72c90a8846271ac63b720b | [log] [tgz] |
|---|---|---|
| author | Jim Miller <jaggies@google.com> | Wed Apr 17 15:49:23 2013 -0700 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Wed Apr 17 15:49:23 2013 -0700 |
| tree | 147b590b4a8420650e4a06bf6690c401c505e74c | |
| parent | 78296cb760bff8bf951e88d6f4ec9a6ff3059406 [diff] | |
| parent | 9bf7be933d039ef227ca54f917c1ff6a00a2f833 [diff] |
am 9bf7be93: Merge "Add permission check for owner-info related LockSettings." into jb-mr2-dev * commit '9bf7be933d039ef227ca54f917c1ff6a00a2f833': Add permission check for owner-info related LockSettings.