OSDN Git Service

resolved conflicts for merge of dbbc0706 to master
authorNick Kralevich <nnk@google.com>
Wed, 2 Jul 2014 23:06:47 +0000 (16:06 -0700)
committerNick Kralevich <nnk@google.com>
Wed, 2 Jul 2014 23:06:55 +0000 (16:06 -0700)
commit4facb0796f7942d8669d19ec1a2fab0e5ffddcc4
tree3bf63c7526eb13b93d51fbf251206f401d087a35
parenta00144ca898ec23c02d3cc4be0ce1bdfee53faf3
parentdbbc070670c1160b15b92a5928e8b9b5bf008b3f
resolved conflicts for merge of dbbc0706 to master

Change-Id: I3b4e442988021d5ac569cb06682bc1355edbb430