OSDN Git Service

resolve merge conflicts of d266361 to mnc-dr1.5-dev am: 922654c09e -s ours
authorMarie Janssen <jamuraa@google.com>
Wed, 11 May 2016 03:58:37 +0000 (03:58 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Wed, 11 May 2016 03:58:37 +0000 (03:58 +0000)
commit6397caca16f9ba78d8837fb16815b1509ad12d24
treed4e309d701382316f192d88dee13cdd476004538
parent0bb5ecaed28a9891b63f199198b5e4a121dff602
parentc292927af51a979bc3c4a15abb6d6599a236bc97
resolve merge conflicts of d266361 to mnc-dr1.5-dev am: 922654c09e  -s ours
am: c292927af5

* commit 'c292927af51a979bc3c4a15abb6d6599a236bc97':
  btif: Don't persist remote devices to the config

Change-Id: I862c9734084a25b2eba8b32c0e03b7d7ab76fdc8