tree 126b4921ddca474eb71ff091cf0639c5861705f7
parent 5d1b6e5a6e1cf95e9fcac471cac383d18602c240
parent e285ab9ebf47e5a4cb7fcf1acdb924b131b97dfa
author Hiroki Yamamoto <hiroki.yamamoto@sonymobile.com> 1491276027 +0000
committer android-build-merger <android-build-merger@google.com> 1491276027 +0000

Merge "Keep BT pairing dialog valid until timeout"
am: e285ab9ebf

Change-Id: I672bf4670305eb85df2336a2da015d9d0646fd8b