OSDN Git Service

resolved conflicts for merge of 4153a39a to master
authorIan Rogers <irogers@google.com>
Wed, 25 Jun 2014 18:10:23 +0000 (11:10 -0700)
committerIan Rogers <irogers@google.com>
Wed, 25 Jun 2014 18:10:23 +0000 (11:10 -0700)
Change-Id: I7e2fa9d5a8ebaa653dd4f25b26d68e13e6abaa27


Trivial merge