OSDN Git Service

resolved conflicts for merge of ae77d6b6 to master
authorBrian Carlstrom <bdc@google.com>
Fri, 2 Aug 2013 19:28:22 +0000 (12:28 -0700)
committerBrian Carlstrom <bdc@google.com>
Fri, 2 Aug 2013 19:28:22 +0000 (12:28 -0700)
commitee8fb1e1d94e0be860e1dc2a5f15d4355a3c6639
tree7fb97efc69ad14058204e54659194ad8e731f9e4
parentcff569c2e9d9c323edc6d974ebe69fded6d18c0c
parentae77d6b60ffa091d4d72597d2dd244cd6758e18f
resolved conflicts for merge of ae77d6b6 to master

Change-Id: If7712cbddd6786c91648c4fc31f04e96937d4670