tree bded6dbfc162cd701f0bebd85a3a4cb073650576
parent acc0043abdef3aab17ea30af2e0a52ac060dedbb
parent d00c851e55a487d03e11ce48e58cba5ff65fa59b
author Dan Willemsen <dwillemsen@google.com> 1526424771 -0700
committer android-build-merger <android-build-merger@google.com> 1526424771 -0700

Merge "Convert to Soong" am: acbd94d76f am: b1005a8a2a
am: d00c851e55

Change-Id: I889b5d31535d927b3aa9cf5ad6af955ca0678356