OSDN Git Service

Merge commit '5c18a675' into manualmerge
authorPaul Lawrence <paullawrence@google.com>
Fri, 5 Jun 2015 00:36:38 +0000 (17:36 -0700)
committerPaul Lawrence <paullawrence@google.com>
Fri, 5 Jun 2015 00:36:38 +0000 (17:36 -0700)
Change-Id: I6f39812ebc476351a103475e6844be1c20032939


Trivial merge