| commit | ed6697ba2b32aac09afafe8f9e15ccd7c3440f3b | [log] [tgz] |
|---|---|---|
| author | Jeff Vander Stoep <jeffv@google.com> | Thu Aug 27 12:21:35 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Thu Aug 27 12:21:35 2015 +0000 |
| tree | ba267981f5efcb2143d8bde5358aeece3f8954c2 | |
| parent | 79a149ba4cbf5d1fe8dbeaf2611d21f5b44f3b5f [diff] | |
| parent | 5b616ea5b2fa8495684012b1543dbe1d5344cce3 [diff] |
am 5b616ea5: (-s ours) am 9ce095c8: Merge "selinux prebuilts: ignore .pyc files" * commit '5b616ea5b2fa8495684012b1543dbe1d5344cce3':