OSDN Git Service

Merge commit '199f9655' into manualmerge
authorNick Kralevich <nnk@google.com>
Fri, 1 Mar 2013 18:01:29 +0000 (10:01 -0800)
committerNick Kralevich <nnk@google.com>
Fri, 1 Mar 2013 18:01:29 +0000 (10:01 -0800)
commit2ce5173afbb4536f3bf2e6ebcfb86e3a7fd14bf2
tree074bed9fb0554c1740f94a5e89a306156747b0fc
parente606757966175e6f287e18ed2e458050f7da3731
parent199f9655528c06e637b9679dd126e3bf5f72798d
Merge commit '199f9655' into manualmerge

these files no longer exist in jb-mr2-dev, so this patch is useless.
Accept the version in jb-mr2-dev