OSDN Git Service

Merge changes from topic 'eSCO' am: a5095e6eac am: 96b45e07ea
authorJack He <siyuanh@google.com>
Thu, 11 May 2017 02:03:46 +0000 (02:03 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Thu, 11 May 2017 02:03:46 +0000 (02:03 +0000)
am: 52361b1cfa

Change-Id: Ie80f0f71b957f372f071d53a7bd6b161be0fc1c7


Trivial merge