tree f1410071b9b8c1f320cd0de055ad046fc7f8a48f
parent d8f25cf27935cdc0ccb3dde25d6dc95713dadf03
parent f10ad1e3b223ed3453b96ac52b62a23e8f7feaa0
author Colin Cross <ccross@android.com> 1477965502 +0000
committer android-build-merger <android-build-merger@google.com> 1477965502 +0000

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

Change-Id: Icb4ff3be94149b7b6338c125bfc098d7853f196a