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

Merge "Convert to Android.bp"
am: 1752ac1e55

Change-Id: I06d49e11d96477898a06b61d9c5819cab1b69684