OSDN Git Service

Merge changes I22b55b73,Id050f2f5 into oc-dev
authorSelim Cinek <cinek@google.com>
Mon, 17 Apr 2017 19:00:28 +0000 (19:00 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Mon, 17 Apr 2017 19:00:28 +0000 (19:00 +0000)
am: d8d7a283bd

Change-Id: Ia147e09d7974c2a4f810ee0df04c602be1760be4


Trivial merge