OSDN Git Service

Merge "Convert to Android.bp"
authorDan Willemsen <dwillemsen@google.com>
Tue, 18 Oct 2016 23:36:42 +0000 (23:36 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Tue, 18 Oct 2016 23:36:42 +0000 (23:36 +0000)
am: 99de09fe7f  -s ours

Change-Id: I16fbbe0cdeffe80b7b92148f696ec2db848cd4cf


Trivial merge