tree f8af1ae137fbf26479700ec8b59da544f4d1f38c
parent 850738d679979948b3d287f04e0a619f66f62ef0
parent b822ad3e06a353a38e4013b3fd6c6c26123e2720
author Jack He <siyuanh@google.com> 1499828458 +0000
committer android-build-merger <android-build-merger@google.com> 1499828458 +0000

Merge "GATT: Expose opportunistic client API to Java" into oc-dr1-dev
am: b822ad3e06  -s ours

Change-Id: Ib97a6200288808c35d30d86d8043284cf9e1437f