tree aead29b49ed15d1fea3f61c84e6aa7a3a0d65da7
parent b9fab8a946d131581d1a7589ddd956d77612363b
parent f6678157654063ec569a9ad29c2628b8aaa0c1e6
author Dan Willemsen <dwillemsen@google.com> 1473819768 +0000
committer android-build-merger <android-build-merger@google.com> 1473819768 +0000

Convert to Android.bp am: c01121c522 am: 61bae021b5
am: f667815765

Change-Id: Icf2771a158554135ed998bd9759d39922e8ea7e9