tree 00ed28fba46e6bf39d65cbcb68aa012431d13552
parent 2d4e12f1473353c76a113abebda363010e027737
parent cc3c973f5fd631dc1850302f7c5d8c990144f133
author Dan Willemsen <dwillemsen@google.com> 1476834223 +0000
committer android-build-merger <android-build-merger@google.com> 1476834223 +0000

Merge "Convert to Android.bp" am: 99de09fe7f  -s ours
am: cc3c973f5f  -s ours

Change-Id: I825715a956f44a0b4371a1526a054c05fac05326