tree fb73a72e81be75c6dbb0bf150b7f75fcbcd90bdc
parent bd9b0e1b35dafef4a2cdcb4dfaf7637467ee2477
parent 325e69119bddc3dcb62af8f69a70f61909f0a7e6
author Dan Willemsen <dwillemsen@google.com> 1505180732 +0000
committer android-build-merger <android-build-merger@google.com> 1505180732 +0000

Merge "Convert to Android.bp" am: 9016ed8106 am: 80320575ce  -s ours
am: 325e69119b  -s ours

Change-Id: Iee44c3c8a705b6a31311a203d9103074885db3b6