am 60f9026e: (-s ours) am b4aa1777: am 782daf89: Merge "Fix the Mac libbase build."

* commit '60f9026e4e9cc137458f51a4f6a63ca0bedf2fa6':
This commit is contained in:
Elliott Hughes 2015-08-27 11:53:28 +00:00 committed by Android Git Automerger
commit bd363c41f3

Diff content is not available