| commit | 821a775c2521b0b76fb56c02f7ace7455e93771a | [log] [tgz] |
|---|---|---|
| author | Nick Kralevich <nnk@google.com> | Tue Mar 04 21:23:38 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Tue Mar 04 21:23:38 2014 +0000 |
| tree | a542f7768dac273df7dc31697005aae4eddde5f6 | |
| parent | 1dbc82d483d2fff670bfb36937968be615fceee5 [diff] | |
| parent | 2df3611dae1bed8af3b869a6013b79816d8cff6f [diff] |
am 2df3611d: resolve conflict for merge of 72888bfa for klp-dev-plus-aosp * commit '2df3611dae1bed8af3b869a6013b79816d8cff6f': Don't read selinux policies from /data