tree f4b1f2464f4052dd58b91170c4766e0aebfc9d47
parent bba672d937d1f6f0ded8a69f9aec0e097cd2d236
parent 5d44089940a104eaf6c86fadd3414996bcc6af5b
author android-build-prod (mdb) <android-build-team-robot@google.com> 1525532081 -0700
committer android-build-merger <android-build-merger@google.com> 1525532081 -0700

Merge "Convert to Soong" am: 9dc8fe3aa0
am: 5d44089940

Change-Id: I3c85f7c9bc13bcd814c27e3650e5d82ec6b4d554