tree 2fc14408c76a8c1879bb139b09cd3ec76a1d96d5
parent 3de7c162c1e63c3fe16b092934bdc3181a591c38
parent b157791ecb9a879c320bc00e8a63db172662792c
author Dan Willemsen <dwillemsen@google.com> 1475000444 +0000
committer android-build-merger <android-build-merger@google.com> 1475000444 +0000

Merge "Convert to Android.bp" am: c103bea5b9 am: 94adbdcf75
am: b157791ecb

Change-Id: I362e99a5d9605e0e9b8f890e60302f7de5a823fe