| commit | fa175c960a36f25bfc1d590c5d671ed2d4a0fb43 | [log] [tgz] |
|---|---|---|
| author | Winson Chung <winsonc@google.com> | Tue Apr 15 21:16:39 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Tue Apr 15 21:16:39 2014 +0000 |
| tree | 8ddfe5c760fbfeb93b89678eaacd080c26c1ff8b | |
| parent | a97a809d230c3cc62b60ce909ed72ffebbf44bb2 [diff] | |
| parent | 4734fd8657b778f6e0631a1f524ed94c9ba0598e [diff] |
am 4734fd86: (-s ours) 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 '4734fd8657b778f6e0631a1f524ed94c9ba0598e': DO NOT MERGE Updating Read/Write settings permission protectionLevels. (Bug 11372484)