OSDN Git Service

Merge changes Ie05a1759,If3b6fc63 am: 1f14eab551
authorPaul Duffin <paulduffin@google.com>
Tue, 6 Feb 2018 15:42:31 +0000 (15:42 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Tue, 6 Feb 2018 15:42:31 +0000 (15:42 +0000)
am: 73771adf83

Change-Id: Iadca3cac054e707d193a7d054d091a13c78e0cbe


Trivial merge