| commit | a0d9ddb8f2922088b08219326afeaf532b3af5ac | [log] [tgz] |
|---|---|---|
| author | Kenny Root <kroot@google.com> | Tue Oct 16 17:49:23 2012 -0700 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Tue Oct 16 17:49:23 2012 -0700 |
| tree | c657c4603c41f1cac92c540bd5e1eb07b4b0c9ad | |
| parent | 2b44a5632613fc99671dae50c5e32f3dbc2aeaa7 [diff] | |
| parent | cd74108cdac228e946ca8b6ea2ff11ab62941a6d [diff] |
am cd74108c: resolved conflicts for merge of 78afed1c to jb-mr1-dev-plus-aosp * commit 'cd74108cdac228e946ca8b6ea2ff11ab62941a6d': Remove HAVE_SELINUX guards