commit | 2eb95ac202429d930545043d742ab443bedbf357 | [log] [tgz] |
---|---|---|
author | Nick Kralevich <nnk@google.com> | Tue Jun 17 16:51:14 2014 +0000 |
committer | Android Git Automerger <android-git-automerger@android.com> | Tue Jun 17 16:51:14 2014 +0000 |
tree | 0319061e91f0f81bf5fc87eb5772b5eabe1be7bd | |
parent | 331f4d5863137e5fd5d59f9a407de2a7227a5c23 [diff] | |
parent | ad6107c3e9901ce520eedcad7770a3a9e4f327d8 [diff] |
am ad6107c3: Merge "Coalesce generic_x86 and generic sepolicy where possible." * commit 'ad6107c3e9901ce520eedcad7770a3a9e4f327d8': Coalesce generic_x86 and generic sepolicy where possible.