tree 1dfaf8d4fd6fd3b0e849c55f5a88d34958195887
parent 0bad91b5ac2ec07ab861a5d01285ca12986a5be6
parent dce01e235beb0926cc4c36a28a4cc3c1f184b4fc
author Etan Cohen <etancohen@google.com> 1483820303 +0000
committer android-build-merger <android-build-merger@google.com> 1483820303 +0000

Merge "[AWARE] Remove reason from discovery session terminate callback" am: bbbe5e6ccd
am: dce01e235b

Change-Id: I0e693ff19f8c08212c4daadebc3b6af33e239eda