| commit | 4734fd8657b778f6e0631a1f524ed94c9ba0598e | [log] [tgz] |
|---|---|---|
| author | Winson Chung <winsonc@google.com> | Tue Apr 15 21:14:24 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Tue Apr 15 21:14:24 2014 +0000 |
| tree | d3454a6daf9496616bdde67ce53b55903ff6b999 | |
| parent | a52c246ca4f3aafa6f67fbc3681eff51c288f87c [diff] | |
| parent | 5a7e3a9f5a035d3d780c888978a4dcc4ba154e3f [diff] |
am 5a7e3a9f: am d0df5cfb: (-s ours) am 00abb042: am 47238f20: am cf238f12: am 85b15c13: DO NOT MERGE Updating Read/Write settings permission protectionLevels. (Bug 11372484) * commit '5a7e3a9f5a035d3d780c888978a4dcc4ba154e3f': DO NOT MERGE Updating Read/Write settings permission protectionLevels. (Bug 11372484)