OSDN Git Service

Merge changes I20bdab1b,Id82f9081 into oc-dev
authorWinson Chung <winsonc@google.com>
Fri, 16 Jun 2017 21:41:38 +0000 (21:41 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Fri, 16 Jun 2017 21:41:38 +0000 (21:41 +0000)
am: 64b044680c

Change-Id: I1a0635a50b834053099abaeda6b0e4935730fb73


Trivial merge