OSDN Git Service

am 11c9cd45: Merge "Fix build"
authorMathieu Chartier <mathieuc@google.com>
Thu, 16 Apr 2015 21:45:54 +0000 (21:45 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Thu, 16 Apr 2015 21:45:54 +0000 (21:45 +0000)
commita96bca9abb7f31591af69c0cba08638bdf48dd79
tree050e70169920ab955852346f8b85773a287b6c59
parentc9dcc5775fe0cb23634df9f1e191b7f45de4de07
parent11c9cd45f2aadad5622fef4b3e81b9e2181ebae3
am 11c9cd45: Merge "Fix build"

* commit '11c9cd45f2aadad5622fef4b3e81b9e2181ebae3':
  Fix build