[automerger skipped] Merge "Remove developer menu: AVDTP delay reports/inband ringing" into pi-dev am: cc31240f28

am: d27f2a4d03  -s ours

Change-Id: I3e8015010828aa0ee394c1e3186ed12b86e36000
This commit is contained in:
Hansong Zhang
2018-05-14 11:47:10 -07:00
committed by android-build-merger

Diff Content Not Available