OSDN Git Service

resolved conflicts for merge of d3501922 to master
authorYing Wang <wangying@google.com>
Wed, 21 Nov 2012 20:28:46 +0000 (12:28 -0800)
committerYing Wang <wangying@google.com>
Wed, 21 Nov 2012 20:28:46 +0000 (12:28 -0800)
Change-Id: I1a934ce39a06fa30d3461b19cfe375400642ea4b


Trivial merge