[automerger skipped] [automerger] DO NOT MERGE Fix unexpected behavior in Bluetooth pairing am: ac6c49d2b0 am: 5b98c9f4a3 am: dfe4cc74f7 skipped: d276b38666 am: 5d27bdb6d2 am: bab8dca667 am: 84061c71d1 am: 41be25548e skipped: 74ff24d1c6 am: c4127072f4 am: 1b7566cd07 am: af077f8d4c -s ours am: 3369767245

am: 9b8c565932  -s ours

Change-Id: I1bea1a448450fd0929570c8238d31cc1d743d6c1
This commit is contained in:
Hansong Zhang
2018-04-09 14:41:01 -07:00
committed by android-build-merger

Diff Content Not Available