| commit | 69f9b5389979a7e174462b330efe890302228b48 | [log] [tgz] |
|---|---|---|
| author | dcashman <dcashman@google.com> | Fri Feb 06 17:55:27 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Fri Feb 06 17:55:27 2015 +0000 |
| tree | b2f3a5a32318be58a10e07b2ab789611f0aa0b4e | |
| parent | 0cc7a53ca83202a32abc12fc9748b60358c334ef [diff] | |
| parent | ef35aac3c00559ff0a8b53c79fbb0b9a9ea9fa87 [diff] |
am ef35aac3: resolved conflicts for merge of 056fff4a to lmp-mr1-dev * commit 'ef35aac3c00559ff0a8b53c79fbb0b9a9ea9fa87': Change SELinuxHostTest to new sepolicy-analyze args.