tree 4a8ccb32b4babf30d8781984f9d668fee025911d
parent 1e72889e1c9aa4bef7c8c43823c88bda29d344d7
parent 3b6de6e6db8e65e2453ed6b4b60d596c2003244b
author Etan Cohen <etancohen@google.com> 1486769147 +0000
committer android-build-merger <android-build-merger@google.com> 1486769147 +0000

Merge "[AWARE] Add support for Subscribe Service ID List Attribute" am: 11cea0d4a3 am: a80d8de804 am: 98bd5591b6
am: 3b6de6e6db

Change-Id: I8423eb0194fc5bf17fca4c0fceb7b489c7a9a595