tree ffbb493d8864ca5269137d1e4d355d4bd01ffccc
parent 1ff0ab73aa1b71b675c02925e1ae061bca53bb17
parent c704149eb9fd927da7b82520f69a8545e4f7604a
author Dan Willemsen <dwillemsen@google.com> 1472528554 +0000
committer android-build-merger <android-build-merger@google.com> 1472528554 +0000

Merge "Convert to Android.bp" am: 1752ac1e55 am: 0476c6d079 am: 9ad2df7d11
am: c704149eb9

Change-Id: Ia64e2715037fa7b3a642aec9d7177a81a7f416e1