tree 1576b584f8154abc70e9a3be30de9bfaee8a24da
parent 1f3d727474aedf1667a1fbb66060b33e80f46e6d
parent cf9b5e13b995b4d857e81392bee2fc97f960d909
author Dan Willemsen <dwillemsen@google.com> 1504997418 +0000
committer android-build-merger <android-build-merger@google.com> 1504997418 +0000

Merge "Convert to Android.bp" am: 65631cf079 am: 8c3849a15d
am: cf9b5e13b9

Change-Id: I2f3e47dddd688ded4409fd61917367a6e705aa6c