| commit | 21dc0aa5a4e54d00bfe7adcc0517871931abd1e6 | [log] [tgz] |
|---|---|---|
| author | Kenny Root <kroot@google.com> | Wed Oct 17 10:05:58 2012 -0700 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Wed Oct 17 10:05:58 2012 -0700 |
| tree | fd645afc0ce241d95d2faa17a2f348b206ff83f9 | |
| parent | babf588cb5402bae5ea6ff6ff4caa1fbb7d38aed [diff] | |
| parent | ad0090e7b8c70cf44609aafbfea8c3946e2802a9 [diff] |
am ad0090e7: resolved conflicts for merge of 85f9ba9e to jb-mr1-dev-plus-aosp * commit 'ad0090e7b8c70cf44609aafbfea8c3946e2802a9': Remove HAVE_SELINUX guards