OSDN Git Service

am 17c550d3: Merge "Fix build" into jb-mr1-dev
authorMichael Jurka <mikejurka@google.com>
Thu, 25 Oct 2012 19:28:17 +0000 (12:28 -0700)
committerAndroid Git Automerger <android-git-automerger@android.com>
Thu, 25 Oct 2012 19:28:17 +0000 (12:28 -0700)
commit1c4fafe902ef9b527abab4be992dcf253efc1701
tree9c2a85e60a7fb6bffbac6294fc1bff871d240fbd
parent9f4d5f1ba9f395092709f042cf6967c05c679c25
parent17c550d3dddafa0b501dbce294db3e1c18de26df
am 17c550d3: Merge "Fix build" into jb-mr1-dev

* commit '17c550d3dddafa0b501dbce294db3e1c18de26df':
  Fix build