| commit | 450f21a97da3d12fa835ed436cab251bbc34cf89 | [log] [tgz] |
|---|---|---|
| author | Kenny Root <kroot@google.com> | Fri Jun 08 14:08:28 2012 -0700 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Fri Jun 08 14:08:28 2012 -0700 |
| tree | 4cba4cc5fcbd6800a8c8647d3f5d921dff90fafe | |
| parent | df3bec04de71eeac8cc2abc178cdda46b1cb151a [diff] | |
| parent | d26f7139a7ff42ca1be470657515767f7509955b [diff] |
am d26f7139: Merge "resolved conflicts for merge of 9855f6e2 to jb-dev-plus-aosp" into jb-dev-plus-aosp * commit 'd26f7139a7ff42ca1be470657515767f7509955b': Add JNI bindings for some of the libselinux interfaces.