OSDN Git Service

Merge commit '953baf092376b91f1e6531f5718dfce89f4bc8c6' into manual_merge_953baf0
authorDavid Sehr <sehr@google.com>
Wed, 31 Aug 2016 20:41:14 +0000 (13:41 -0700)
committerDavid Sehr <sehr@google.com>
Wed, 31 Aug 2016 20:53:53 +0000 (13:53 -0700)
Change-Id: I065293c7299c2c917442322b127bbac0cb0b2a51


Trivial merge