tree 6a9d361ba706a752e963aa699f89aaeafb5c10f0
parent 2288c81326df4af38ba38dadcbbb8cca0fb252d6
parent 1f4ee781bc48d4f6d3f83784ac424ce20288a108
author Myles Watson <mylesgw@google.com> 1506113283 +0000
committer android-build-merger <android-build-merger@google.com> 1506113283 +0000

Merge changes from topic "avrcp_cherry_picks" am: b4e17814f0 am: 898bc38860 am: 8c95e9be38
am: 1f4ee781bc

Change-Id: Id457833fd93065074d8d338d577e91da857ba41b