tree da4e55ca45a72815dab3dc5a5eba7f4149188347
parent aba4ab89e211582ef0a78288898be97afe41963b
parent 9b506e3996e410feb9a7a19fc70a9f2c5bcd3bca
author Dan Willemsen <dwillemsen@google.com> 1472168606 +0000
committer android-build-merger <android-build-merger@google.com> 1472168606 +0000

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

Change-Id: I48e3b3b7dfc9c09da8c118c23824670d95935a84