OSDN Git Service

resolve merge conflicts of 04c7dc2 to master
authorRobin Lee <rgl@google.com>
Thu, 21 Apr 2016 19:39:13 +0000 (20:39 +0100)
committerRobin Lee <rgl@google.com>
Thu, 21 Apr 2016 19:39:13 +0000 (20:39 +0100)
commit99301e06fac91d59b81cfc119f9d8f987cbd087b
tree75a5f37086243304d73519fc1fa858432d141f90
parentb31f7562ff8b8ed38cabe72cd9af4c97822fc154
parent04c7dc2424c775d7b4a3a7368a8e837b644c35d8
resolve merge conflicts of 04c7dc2 to master

Change-Id: I65d9aa34af7d9138b8b0b5ee76dc0de800d88d26