OSDN Git Service

am b009280d: am e4f00b2a: (-s ours) Merge commit \'6d05ef2310bdc84811d5b0385b009ad114...
authorBill Yi <byi@google.com>
Wed, 30 Apr 2014 12:17:24 +0000 (12:17 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Wed, 30 Apr 2014 12:17:24 +0000 (12:17 +0000)
commit39c5e9f87670a8bc543a716ac994c8c85ac94cd5
treeaaedb12aaccc159d74b7c4bb126d815a7ce4912b
parent791781bfb8cdcdf90e32968159603e2fe5098d94
parentb009280d5acb85a7c7e51daf52a9834ba63a8ae7
am b009280d: am e4f00b2a: (-s ours) Merge commit \'6d05ef2310bdc84811d5b0385b009ad11447a749\' into HEAD

* commit 'b009280d5acb85a7c7e51daf52a9834ba63a8ae7':