OSDN Git Service

Merge "[AWARE] Modify the discovery session handle to uint8_t" am: ff14eb32cd am...
authorEtan Cohen <etancohen@google.com>
Fri, 10 Feb 2017 03:00:34 +0000 (03:00 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Fri, 10 Feb 2017 03:00:34 +0000 (03:00 +0000)
commit7d1674ddd154ac58302e590ce6794dce1229acb9
treeed845b6f136ed59ce5b7d17a8b37a78761db0e63
parent4ce38bc27ff318183baeee33fc6ebedd1384b30c
parent1215f81a36fb0552d75b9b95f2a8c1c1eec799d0
Merge "[AWARE] Modify the discovery session handle to uint8_t" am: ff14eb32cd am: b4df78f006 am: 2ec9fbf47b
am: 1215f81a36

Change-Id: Ia4634d47562e052205605fd23d98b4ec844de139