| commit | e92f67e362d480fb16b64eb5c7c9950b9e885b2f | [log] [tgz] |
|---|---|---|
| author | Winson Chung <winsonc@google.com> | Tue Apr 15 21:06:01 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Tue Apr 15 21:06:01 2014 +0000 |
| tree | 9627498e73ac1b188d6eb2c6dcb68e7fe7d180f3 | |
| parent | df7ba8b67332adc33c2400dcf310cad7de8452dd [diff] | |
| parent | f39c8a31c4e4f8f3ba8ff105a1e5a05ca0555e70 [diff] |
am f39c8a31: am a97a809d: am a52c246c: (-s ours) am 145659e0: DO NOT MERGE Updating Read/Write settings permission protectionLevels. (Bug 11372484) * commit 'f39c8a31c4e4f8f3ba8ff105a1e5a05ca0555e70': DO NOT MERGE Updating Read/Write settings permission protectionLevels. (Bug 11372484)