tree a22b13b70f12b047337f696c4292aaa1702d8562
parent ba8b18e1e88b9d510df6a7fb7c289b94fe06b6ba
parent 9f1b9bb71019b9a773d847cec6f10c198cd6c459
author Dan Willemsen <dwillemsen@google.com> 1440652206 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1440652206 +0000

am 9f1b9bb7: (-s ours) am 5e7b21bb: Merge "build: wildcard isn\'t guaranteed to be sorted"

* commit '9f1b9bb71019b9a773d847cec6f10c198cd6c459':