OSDN Git Service

Merge commit '0a70ec8e' into manualmerge
authorYing Wang <wangying@google.com>
Fri, 24 Jan 2014 22:11:35 +0000 (14:11 -0800)
committerYing Wang <wangying@google.com>
Fri, 24 Jan 2014 22:11:35 +0000 (14:11 -0800)
commitb28e0570e040a0d86180ea0ea909bc2e1ce7e08f
tree1c76fa5a0f84fb420cd99d075f7405878dbeba06
parent838592d5cb4c44d4479a6f8d032eff503f9b1d76
parent0a70ec8e6fdd474b6385919816bfd93a2825a681
Merge commit '0a70ec8e' into manualmerge