OSDN Git Service

Merge "DO NOT MERGE ANYWHERE Add Wear-specific feature to override LE IO capability...
authorJacky Cheung <jackyc@google.com>
Thu, 20 Oct 2016 21:43:25 +0000 (21:43 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Thu, 20 Oct 2016 21:43:25 +0000 (21:43 +0000)
am: 67560541dd  -s ours

Change-Id: I3bc4380d5604137577a5cf9dea838f8ab6b1b7ab


Trivial merge