tree 0966d796d7748ca117e6b26265f037fa2ccaef40
parent 5b43e2caa87cab3fc762416b6ca8e05352141b1d
parent ff14eb32cdc9fe4319d2cc7316797fca59c703b6
author Etan Cohen <etancohen@google.com> 1486695243 +0000
committer android-build-merger <android-build-merger@google.com> 1486695243 +0000

Merge "[AWARE] Modify the discovery session handle to uint8_t"
am: ff14eb32cd

Change-Id: I5db49744cb78e623e3b1ff2e65d67af69d5b0ed0