OSDN Git Service

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

* commit '4ec6f7603acaf453a1f280e2fad1a1d0e35dbfa5':
  Offload config save functionality to BTIF thread

Change-Id: I5b2b382d61afa058514f339392d6f4230df68839