tree 79f4d13f79cfc7222aa28b6633fae730972d58eb
parent 8409386dc21fb229634a154457a713bc2bcc52d9
parent f940be24d2a72db52aac7bbc745c6d96228844eb
author Dan Willemsen <dwillemsen@google.com> 1474650824 +0000
committer android-build-merger <android-build-merger@google.com> 1474650824 +0000

Merge "Convert to Android.bp" am: 4e3bf63705 am: c13b3501c4
am: f940be24d2

Change-Id: I0f89eebb1b565108ec9ecf01e01c72cec74fd5ad