tree bdaae59f71f6a59168b74187395e2497f7b5726b
parent a77e9c6399483e6bee7a737f01640c8c2c822017
parent c8b34b1c2c505082a87c534433e6449d59ac6610
author Etan Cohen <etancohen@google.com> 1487717403 +0000
committer android-build-merger <android-build-merger@google.com> 1487717403 +0000

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

Change-Id: I433a08ac78cbf565f7c82d70dda0461f4fb2d67d