tree 0aec5b735b94d12717bf4f2d7a206c9d13d6231a
parent cbe9d05020fab101afab2db8d44acc4bc5d5dc02
parent 48131449d6258e369e5afeb6c665cc6a343ca297
author Colin Cross <ccross@android.com> 1429556192 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1429556192 +0000

am 48131449: am 858cd9db: am b2b06de5: Merge "statically link adb and fastboot against libc++"

* commit '48131449d6258e369e5afeb6c665cc6a343ca297':
  statically link adb and fastboot against libc++