tree f1410071b9b8c1f320cd0de055ad046fc7f8a48f
parent a481d8aa5c4eece182fb592128a7c4aced7ee989
parent 0bbba1b52549fa827225b37f465555281ae6c06e
author Colin Cross <ccross@android.com> 1477965200 +0000
committer android-build-merger <android-build-merger@google.com> 1477965200 +0000

Merge "Convert Android.mk to Android.bp"
am: 0bbba1b525

Change-Id: If3f8835f77b52929a17a97a19fb33db5b1cce3fd