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:04:53 +0000 (22:04 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Tue, 10 Oct 2017 22:04:53 +0000 (22:04 +0000)
am: 4758facf28

Change-Id: Ie6a6ff729b8d5461f86a7ab9e3dbb6f04f4659b5


Trivial merge