tree 324d9863889c950c1c730f79069962bb856dc506
parent 67b545e78871f63cd00a7997f60a11089f125cba
parent 0471a2975a0aba45b45f02aea499773d15e32d49
author Andre Eisenbach <eisenbach@google.com> 1495241776 +0000
committer android-build-merger <android-build-merger@google.com> 1495241776 +0000

Merge "OBEX: Add required parameters TAG ID's for PBAP 1.2" am: a2663b0060 am: b04d7ceaeb am: a8ffb9fd3d
am: 0471a2975a

Change-Id: I98a1b0f3250e5f0bbfdb6310c2460894224cb64b