OSDN Git Service

Merge changes from topic 'ClosebySystem' into oc-mr1-dev am: 81021c77c8
authorPhilip P. Moltmann <moltmann@google.com>
Wed, 9 Aug 2017 01:43:25 +0000 (01:43 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Wed, 9 Aug 2017 01:43:25 +0000 (01:43 +0000)
am: 560d56500c

Change-Id: I171672bc56b845f87e602c84043ff90b59f25797


Trivial merge