tree e61943cff8a5422e4638eced3a31b7d8ca596e97
parent 3e46f4af4f52aee324601b449abf9219bfd6b362
parent 20329fa4274128beadd1dde04edd26478673f116
author Dan Albert <danalbert@google.com> 1427740596 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1427740596 +0000

am 20329fa4: am 6d457fe1: Merge "Enable building libbase on Windows."

* commit '20329fa4274128beadd1dde04edd26478673f116':
  Enable building libbase on Windows.