OSDN Git Service

am 60430803: Merge "Fix Mac build."
authorVladimir Marko <vmarko@google.com>
Mon, 26 Jan 2015 15:52:34 +0000 (15:52 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Mon, 26 Jan 2015 15:52:34 +0000 (15:52 +0000)
commitb1672806e20714cf5f748157d480eabee715e58d
tree46056ff39cdf661ea943400cfeff1ccd7dcaadb3
parent1d3cb5f587107d63ece8ff3f3906ab3461f32d38
parent60430803a7964b68269e42f04acadb070b25c58c
am 60430803: Merge "Fix Mac build."

* commit '60430803a7964b68269e42f04acadb070b25c58c':
  Fix Mac build.