tree 183e0c323c7ca1aaedf53022157040159fd7bee9
parent a52ac9bc62c3f69afa44b98881cce3b9367e686a
parent 44cbf8d3b05bc4f78be0edb42618caffeab0539f
author Colin Cross <ccross@android.com> 1458953130 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> 1458953130 +0000

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