OSDN Git Service

Merge changes from topic "b23270724" into nyc-dev am: 45a05eb567 am: e79b2f044c ...
authorMarco Nelissen <marcone@google.com>
Tue, 10 Oct 2017 22:24:30 +0000 (22:24 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Tue, 10 Oct 2017 22:24:30 +0000 (22:24 +0000)
am: fc64ad47f6

Change-Id: Ie7cf45469fd8d2a731c2d888027cec9ba76f1bc8


Trivial merge