OSDN Git Service

Merge changes I858017b8,Ife32b600 into oc-dev am: 63e8bfe1c5
authorSelim Cinek <cinek@google.com>
Wed, 17 May 2017 16:18:22 +0000 (16:18 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Wed, 17 May 2017 16:18:22 +0000 (16:18 +0000)
am: 29260fd33b

Change-Id: Ida456542645ab7654705631dcba4d602669372e2


Trivial merge