OSDN Git Service

Merge bb41d06d
authorJean-Baptiste Queru <jbq@google.com>
Thu, 16 Jun 2011 14:19:44 +0000 (07:19 -0700)
committerJean-Baptiste Queru <jbq@google.com>
Thu, 16 Jun 2011 14:19:44 +0000 (07:19 -0700)
commit5aa44e2d7a15a743113aab386e465492d101e2bd
treea0ef3428dac64b48ebcf3438ebe5b8fc251c7fa1
parent78e7f1f014073fd4a788ecf293fa43f6fe32b894
parentbb41d06d9645b38a3de587512396b7b4a77fc7f7
Merge bb41d06d

Change-Id: Ieeeec2e835e3e7eb223a5f62927111db24295ccf