| commit | 06b895ea48eacb5eecb0d3afa878f1efd4bd816f | [log] [tgz] |
|---|---|---|
| author | Nick Kralevich <nnk@google.com> | Tue Jun 17 18:06:10 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Tue Jun 17 18:06:10 2014 +0000 |
| tree | 084c352b3d17ef8fc4138d6f9404fbf68aadd771 | |
| parent | 3fd79a352e09d89ff9914863dda477827a635895 [diff] | |
| parent | f9172a61d742ac048fced2c264585068a42527b3 [diff] |
am f9172a61: am 2eb95ac2: am ad6107c3: Merge "Coalesce generic_x86 and generic sepolicy where possible." * commit 'f9172a61d742ac048fced2c264585068a42527b3': Coalesce generic_x86 and generic sepolicy where possible.