| commit | 02f711263cf30daf90361a4ba93bef4c2d0e38fc | [log] [tgz] |
|---|---|---|
| author | Maggie Benthall <mbenthall@google.com> | Fri Aug 30 06:56:29 2013 -0700 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Fri Aug 30 06:56:29 2013 -0700 |
| tree | 334cba7d66437185f3af1af0348ed80172e776c0 | |
| parent | 01ec62c46bc8bb54282cc11ee2c34d01d6986cc5 [diff] | |
| parent | ac19f2bc1c65865fa59feb7fbd9e19dd259048c3 [diff] |
am ac19f2bc: Merge "Fixes for pin-restricted settings." into klp-dev * commit 'ac19f2bc1c65865fa59feb7fbd9e19dd259048c3': Fixes for pin-restricted settings.