OSDN Git Service

Merge remote-tracking branch 'goog/master' into nyc-dev
authorNicolas Geoffray <ngeoffray@google.com>
Tue, 23 Feb 2016 11:12:17 +0000 (11:12 +0000)
committerNicolas Geoffray <ngeoffray@google.com>
Tue, 23 Feb 2016 11:43:48 +0000 (11:43 +0000)
bug:27173201
bug:23128949
bug:26846185
Change-Id: I7333734be71a83dc4808735ead80ae3a4dcd841d


Trivial merge