OSDN Git Service

Merge "Change companion languare from 'pair' to 'link'/'ok'" into oc-dev am: e4964118c6
authorEugene Susla <eugenesusla@google.com>
Mon, 24 Apr 2017 22:14:18 +0000 (22:14 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Mon, 24 Apr 2017 22:14:18 +0000 (22:14 +0000)
am: 6417845d9f

Change-Id: I9e1b119efdeab25932d81a749cfaa8d0b67478c4


Trivial merge