OSDN Git Service

Merge changes I4b58610f,Ib758756a into oc-dev
authorJoe Onorato <joeo@google.com>
Wed, 31 May 2017 01:14:54 +0000 (01:14 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Wed, 31 May 2017 01:14:54 +0000 (01:14 +0000)
am: a9873bc8f6

Change-Id: I07b352ee11492718ee2abb76d48937f39f17125c


Trivial merge