OSDN Git Service

am 77d93bce: Merge "fix build"
authorTim Murray <timmurray@google.com>
Thu, 24 Jul 2014 22:25:59 +0000 (22:25 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Thu, 24 Jul 2014 22:25:59 +0000 (22:25 +0000)
commitd161be2d063565ecab6d1fce4440d496d8928abc
tree3a1565d9508e12fe8499f1c70aaf50da312f3a6a
parenteb9563f9ab610ca09bf99c6975f70c14c35683bd
parent77d93bceb06dd3983868327b03a726bf5d8ae079
am 77d93bce: Merge "fix build"

* commit '77d93bceb06dd3983868327b03a726bf5d8ae079':
  fix build