tree 326ba27aef1df9c558de6d7a06ace245a9303d0b
parent e2a0702821c7f4ed9b90d450da9b0364205d12b6
parent 1191a4c5da56b2f8790958f4a51206761bd04cce
author android-build-team Robot <android-build-team-robot@google.com> 1525487522 -0700
committer android-build-merger <android-build-merger@google.com> 1525487522 -0700

Merge "[AWARE] Update docs for service discovery callbacks" into pi-dev am: b9147471ec
am: 1191a4c5da

Change-Id: If81d0074074058ab41944e097dad22f1651b9f7b