| commit | 40281ecc51677fce656333ec115c31740696ad04 | [log] [tgz] |
|---|---|---|
| author | Winson Chung <winsonc@google.com> | Tue Apr 15 21:20:05 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Tue Apr 15 21:20:05 2014 +0000 |
| tree | 8ddfe5c760fbfeb93b89678eaacd080c26c1ff8b | |
| parent | fa175c960a36f25bfc1d590c5d671ed2d4a0fb43 [diff] | |
| parent | dbab639619e4648134c0681b0c94e63a9dafa7a0 [diff] |
am dbab6396: (-s ours) am 9eb5f8e9: am 4a9c5784: (-s ours) am 50a74f1b: am 64ab2489: am 7c1e71a9: am b2c94b6e: am 48ff1356: am 54dba509: DO NOT MERGE Updating Read/Write settings permission protectionLevels. (Bug 11372484) * commit 'dbab639619e4648134c0681b0c94e63a9dafa7a0': DO NOT MERGE Updating Read/Write settings permission protectionLevels. (Bug 11372484)