tree da4e55ca45a72815dab3dc5a5eba7f4149188347
parent fb7cfc1a4a863a6e69558f6d767df32cf4bd7c88
parent df8fb9e81c11194a9e2dda7bf39df4864fdafaad
author Dan Willemsen <dwillemsen@google.com> 1472166400 +0000
committer android-build-merger <android-build-merger@google.com> 1472166400 +0000

Merge "Convert Android.mk to Android.bp" am: 4d418b1e08 am: 93c1f4248d
am: df8fb9e81c

Change-Id: Id852b52224b197ad2d0ff5791a25b1bff791d512