tree 80b3671ac0792b671db03abb0500aeb6a5d02480
parent 946b287abdafbe9ae8105ca31a4d8a5b0d9cec7f
parent 940944655a4c5ab06cc6f7c9657b0c43ff83ba5e
author Colin Cross <ccross@android.com> 1459205499 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> 1459205499 +0000

Merge "Update Android.bp to match Android.mk"