tree b1c9720cc800b1b4d52e07541fe0c9fe67dafde7
parent 9817c6c0cfa01f6bf7e0700e2b7aab2c1220fe28
parent a3f9fca568015e6f16640e1c85d4f5bd28180747
author Colin Cross <ccross@android.com> 1452717099 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> 1452717099 +0000

Merge "Update Android.bp for changes to Android.mk"