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)
commit8014813203eda553ae0975b30b7f859765a7a1c0
treeaa1912164be7e4003117ae02a4c8e778419d013f
parent73e05b577e45797093b4397e927aeb916fd57a74
parent4ec6f7603acaf453a1f280e2fad1a1d0e35dbfa5
resolve merge conflicts of f7388e6 to nyc-dev
am: 4ec6f7603a

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

Change-Id: Ie34873f424479ddb93af79eef6f3072f38322f2e