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