OSDN Git Service

Merge "[AWARE] Add support for SDEA.ServiceInfo field" am: 97c3540042 am: d57bae0f76
authorEtan Cohen <etancohen@google.com>
Fri, 10 Feb 2017 23:23:05 +0000 (23:23 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Fri, 10 Feb 2017 23:23:05 +0000 (23:23 +0000)
commitf8dd4dfcddd6e32700555da9531139d6c1789b53
tree0b2304b4e5cac9d39b2c7ce956e99d541588a898
parent8fc8e3634c7afb484bb8c4827da31a464c732a1d
parent07d361883240a7c1324698609f37b5bdd3b83493
Merge "[AWARE] Add support for SDEA.ServiceInfo field" am: 97c3540042 am: d57bae0f76
am: 07d3618832

Change-Id: I070cac8b02ff1d6d03c4d8329ca7d2d5f390cda2