commit | 5b9ad7995e7f0e3414067de4fa7131188a685a2e | [log] [tgz] |
---|---|---|
author | Tim Murray <timmurray@google.com> | Wed Jan 07 19:47:36 2015 +0000 |
committer | Android Git Automerger <android-git-automerger@android.com> | Wed Jan 07 19:47:36 2015 +0000 |
tree | f77c64696b10a3b6c322b513d6925eaaef08cc37 | |
parent | 56b95690d609053ca41b172d33dbd8a758118365 [diff] | |
parent | 1ca22d17f714c2ebae5f0b06ba6fa7dee55bb0b9 [diff] |
am 1ca22d17: Merge "Use integrated-as on Darwin" * commit '1ca22d17f714c2ebae5f0b06ba6fa7dee55bb0b9': Use integrated-as on Darwin