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)
Change-Id: If7712cbddd6786c91648c4fc31f04e96937d4670


Trivial merge