| commit | f9172a61d742ac048fced2c264585068a42527b3 | [log] [tgz] |
|---|---|---|
| author | Nick Kralevich <nnk@google.com> | Tue Jun 17 16:56:57 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Tue Jun 17 16:56:57 2014 +0000 |
| tree | 4de89e186d688d38b9ffe9c1b2b4466f5c48db28 | |
| parent | 7be1a5197ffb97aebc8a175b7a5dcbed248ac8a7 [diff] | |
| parent | 2eb95ac202429d930545043d742ab443bedbf357 [diff] |
am 2eb95ac2: am ad6107c3: Merge "Coalesce generic_x86 and generic sepolicy where possible." * commit '2eb95ac202429d930545043d742ab443bedbf357': Coalesce generic_x86 and generic sepolicy where possible.