tree 61708d8c3e6af5df302a500c8ef4fefca3422db4
parent 41e71e5c92139778c294f6df3a970d2e1e599055
parent a50b46b7bbfc65d7ff7eb2666cb28511f0588275
author Dan Willemsen <dwillemsen@google.com> 1475686914 +0000
committer android-build-merger <android-build-merger@google.com> 1475686914 +0000

Merge "Convert to Android.bp"
am: a50b46b7bb

Change-Id: I10a6b0c373f7bad17aed618fceaf68cd105f28f3