OSDN Git Service

Merge changes I20bdab1b,Id82f9081 into oc-dev am: 64b044680c am: 552bdceeaf
authorWinson Chung <winsonc@google.com>
Fri, 16 Jun 2017 22:13:43 +0000 (22:13 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Fri, 16 Jun 2017 22:13:43 +0000 (22:13 +0000)
am: 60252a2718

Change-Id: Ib580e3d67747a24f85c5d801e8f4129d1c5a7ab6


Trivial merge