tree cc01a667837c818be0e54a9fade2d442c6605d1d
parent 28ce96b7befd6ad029b9d8c9941ac91f34624893
parent d25479d1ed0a18420d9c011fcbdae5e210552e70
author Dan Willemsen <dwillemsen@google.com> 1470176116 +0000
committer android-build-merger <android-build-merger@google.com> 1470176116 +0000

Merge "Convert Android.mk to Android.bp" am: 7ee95c3a50 am: 56698ebc6a
am: d25479d1ed

Change-Id: I6a6e39ea35a31b3771a17cbc89c2bb106b75a20d