OSDN Git Service

resolve merge conflicts of f7388e6 to nyc-dev am: 4ec6f7603a am: 8014813203
authorPankaj Kanwar <pkanwar@google.com>
Fri, 29 Apr 2016 23:49:43 +0000 (23:49 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Fri, 29 Apr 2016 23:49:43 +0000 (23:49 +0000)
am: 6a68308bf0

* commit '6a68308bf0935f06e9be3495e1bbb3e4e896b769':
  Offload config save functionality to BTIF thread

Change-Id: Id0e3522f6d6c41ff506e0b74d9e9f01e03e58ef1


Trivial merge