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:18:25 +0000 (22:18 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Tue, 10 Oct 2017 22:18:25 +0000 (22:18 +0000)
am: 32d62af8e0

Change-Id: I9f59f0429fdbb0e6bc6607b3e757fc1ac8f017b1


Trivial merge