tree 4fc160abeaed6d16bce8ff481cef6ad4ea02d4bf
parent 63683f84e37f27cc63aaf43341d2e5fbe0f6559c
parent a6c76c77cadfe29d721449fb3736e26ddc9c9d7d
author Tobias Thierer <tobiast@google.com> 1501152724 +0000
committer android-build-merger <android-build-merger@google.com> 1501152724 +0000

Merge "Allow builds with costum toolchains." am: 1d9689b3e7 am: b95ebd36c5 am: f932fdbca1
am: a6c76c77ca

Change-Id: Ie98311479e1e2243858e20a3c18a3240f931f771