| commit | 1ab237daf795ae4a32dcc7a01717a82f38473cdd | [log] [tgz] |
|---|---|---|
| author | Nick Kralevich <nnk@google.com> | Wed Jun 04 21:53:10 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Wed Jun 04 21:53:10 2014 +0000 |
| tree | 3d511653fb101ba9ec57048da974fa9b44a4b6ca | |
| parent | 71f5b435ce3cbb6cdf4191cb9cbd120b81bb9747 [diff] | |
| parent | 7ed6dda5445c497b52e945d436de6c630916a690 [diff] |
am 7ed6dda5: am 7eb0d884: Merge "selinux: resync to internal master" * commit '7ed6dda5445c497b52e945d436de6c630916a690': selinux: resync to internal master