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)
commit84d2de985ec73d5c12bd03cc0b8bbb0d24be4689
tree45896d1a6a630e4301441efaa99b8460a1de988b
parent62b90b3f61d96527800b43f3d467e32f06e1e8f1
parentd35019220f1bbc0766a383d9502bcab956dec20c
resolved conflicts for merge of d3501922 to master

Change-Id: I1a934ce39a06fa30d3461b19cfe375400642ea4b