tree ca13f16b22500be40bd4e28a3d27d779416b2d5f
parent 166c78939dfb8ba09174c1d7741e0607c9d85bdb
parent bbdd15392b345923a3b523a7c09392d6bacd9911
author Jiyong Park <jiyong@google.com> 1520836345 +0000
committer android-build-merger <android-build-merger@google.com> 1520836345 +0000

Merge "Convert Android.mk to Android.bp" am: a64fe320ae
am: bbdd15392b

Change-Id: Ie727c3f6c15cd57a78b08372b70d881600cf8a40