tree 64af3838be8f1b24b60ba12aa6a0d6dc2d5a37d2
parent 9fdd32e6758bcca54518b82a6876e7cd6934cd90
parent 8f2b472ae1b1914335e3834242c33c26d1d76cad
author android-build-prod (mdb) <android-build-team-robot@google.com> 1525555727 -0700
committer android-build-merger <android-build-merger@google.com> 1525555727 -0700

Merge "Convert to Soong"
am: 8f2b472ae1

Change-Id: I97a2917d8f1ea9c868ce7bf88223e6f4aad8bd3f