OSDN Git Service

reset to klp-dev at 9a69cbb with history
authorQiwen Zhao <zhao@google.com>
Fri, 14 Feb 2014 22:35:05 +0000 (14:35 -0800)
committerQiwen Zhao <zhao@google.com>
Fri, 14 Feb 2014 22:35:05 +0000 (14:35 -0800)

Trivial merge