OSDN Git Service

am 2714ceb2: am 14b65781: am 50382728: Merge "Fix Mac build"
authorGlenn Kasten <gkasten@android.com>
Wed, 30 Sep 2015 23:58:18 +0000 (23:58 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Wed, 30 Sep 2015 23:58:18 +0000 (23:58 +0000)
commitb2652163787575e6494a28e30eac015f52a5eea5
treed2c855ca58b4fadb78ccbdf66d5fe925609f17b1
parente54159c4c3ac25601ae1b8cd5ccec6966e97b4cb
parent2714ceb2b4baf2cc256742a72875c8ee4251c57a
am 2714ceb2: am 14b65781: am 50382728: Merge "Fix Mac build"

* commit '2714ceb2b4baf2cc256742a72875c8ee4251c57a':
  Fix Mac build