tree bdaae59f71f6a59168b74187395e2497f7b5726b
parent 58ab9c1468e072102fdf11a28c46cedbbc8d1dde
parent aac3de67d3fc7ff539970d0e2e42a0fafea79aff
author Etan Cohen <etancohen@google.com> 1487717523 +0000
committer android-build-merger <android-build-merger@google.com> 1487717523 +0000

Merge "[AWARE] Add service support for SDEA service info" am: c8b34b1c2c
am: aac3de67d3

Change-Id: I581633ef0b6393a281b2ca3c47ba85b0743760c2