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

* commit 'bd363c41f3d2c5c32d68a24f648718cda1da915f':
This commit is contained in:
Elliott Hughes 2015-08-27 14:35:50 +00:00 committed by Android Git Automerger
commit 3c94830ce4

Diff content is not available