| commit | 9a7b1205ed5097c8a62f2cf7674e5cfea53a0b6d | [log] [tgz] |
|---|---|---|
| author | Nick Kralevich <nnk@google.com> | Thu Aug 27 10:21:18 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Thu Aug 27 10:21:18 2015 +0000 |
| tree | 715d547d2502de8d04de0ec12233b3183ce62c99 | |
| parent | 29c77cc98a2bcd006d746b46902af93e4a7c05de [diff] | |
| parent | 715bb2f64b22e81e65c0f2dfe47fb8afd9afe3d4 [diff] |
am 715bb2f6: (-s ours) am f3ae2603: am 10e0f079: Merge "SELinuxPolicyInstallReceiver: Switch to file_contexts.bin." * commit '715bb2f64b22e81e65c0f2dfe47fb8afd9afe3d4':