tree 7a7a76e195d6d9696aa75072f47b058d8e7d2f29
parent 89edbf61d4b45bf38e9d5fb6b1342c3889fe689b
parent 0a5905c139895dc86eb50406efcb397b5c472427
author Dan Willemsen <dwillemsen@google.com> 1490052082 +0000
committer android-build-merger <android-build-merger@google.com> 1490052082 +0000

Merge "Remove USE_SOONG_UI=false" am: ebf57f6f0a am: 35bdbdfdc3
am: 0a5905c139

Change-Id: I74719ac53bd7c477c71e3680657139d7dfa9db5c