tree 5368e402f4dab941b3231e48c6a703f53e475f23
parent 1f991a379eb05f38cf34406c6d6dbd3e6ea1cbfe
parent da559c7cdb0a9ba18fda6fa4488586ded8a5f3c1
author Colin Cross <ccross@android.com> 1468359469 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> 1468359469 +0000

Merge "Convert Android.mk to Android.bp"