| commit | 1cae5f81436b1b6d03c7e4525e0989987dfe10c0 | [log] [tgz] |
|---|---|---|
| author | keunyoung <keunyoung@google.com> | Mon Apr 01 18:44:43 2013 -0700 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Mon Apr 01 18:44:43 2013 -0700 |
| tree | 3802f1be3e8e81d88e4d612b4715a03555d3d4c6 | |
| parent | 4b34d37d1c0fc3be3c66cb323715a6263984c84f [diff] | |
| parent | 7104a313579e6cbbfa62f848f1e69f25786289c1 [diff] |
am 7104a313: (-s ours) DO NOT MERGE resolved conflicts for merge of 0ce7d5e3 to jb-mr1-dev-plus-aosp * commit '7104a313579e6cbbfa62f848f1e69f25786289c1': DO NOT MERGE Allow writable files in /sys/fs/selinux