OSDN Git Service

Merge changes from topic 'eSCO'
authorJack He <siyuanh@google.com>
Thu, 11 May 2017 01:59:52 +0000 (01:59 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Thu, 11 May 2017 01:59:52 +0000 (01:59 +0000)
am: a5095e6eac

Change-Id: I6ec9013bc90d038078e33e271e77125a45689f1d


Trivial merge