OSDN Git Service

Merge "Fix build" into jb-mr1-dev
authorMichael Jurka <mikejurka@google.com>
Thu, 25 Oct 2012 19:25:31 +0000 (12:25 -0700)
committerAndroid (Google) Code Review <android-gerrit@google.com>
Thu, 25 Oct 2012 19:25:31 +0000 (12:25 -0700)
commit17c550d3dddafa0b501dbce294db3e1c18de26df
tree9c2a85e60a7fb6bffbac6294fc1bff871d240fbd
parenta36cc0eb13e14b02bb7df53c7343d73ba33e3c8e
parentc7a8d8165b12a581e689d1058c9862f215b3d8b9
Merge "Fix build" into jb-mr1-dev