OSDN Git Service

Merge "Fix build"
authorAmith Yamasani <yamasani@google.com>
Fri, 12 Jul 2013 19:24:09 +0000 (19:24 +0000)
committerAndroid (Google) Code Review <android-gerrit@google.com>
Fri, 12 Jul 2013 19:24:10 +0000 (19:24 +0000)
commit46db67cf7f974d4918c5c73ffc41d7058b74ccf0
treeb27f96db80b8dc1a58c054dcf7c6263334138247
parent7ab34954c8f865084c5cb883a2386e6c7216025e
parented411593ece8fc83e1c41d6cae5f0bf049490101
Merge "Fix build"