Merge "Add developer menu entry to enable Bluetooth AVDTP delay reports" am: ad84c9552d
-s ours am: d2040309ca
am: c9f1e73dc7
-s ours
Change-Id: I53faa69e09a06948e6ff47ee1d8a0848ccbca592
This commit is contained in: