tree 19d379b0401036ea426b516e34650a4bd81f1e4e
parent 275c1ac91c61e7a1b4cc3504c88f05a6a12988fd
parent a8ffb9fd3d0ed50236b5d332f36d2861b35cc0b1
author Andre Eisenbach <eisenbach@google.com> 1495241420 +0000
committer android-build-merger <android-build-merger@google.com> 1495241420 +0000

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

Change-Id: I4313e847de1e6cfd550bc9b1ca6a8c121b6c0403