OSDN Git Service

Merge "Allow factory reset when bluetooth is off (2/2)" am: de5fdee
authorAjay Panicker <apanicke@google.com>
Sat, 2 Apr 2016 00:00:41 +0000 (00:00 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Sat, 2 Apr 2016 00:00:41 +0000 (00:00 +0000)
commit446c7872f2c967f274a36a06933fd1e620f20e14
tree5b11e36494d8ef1ae26d2c9e2e6bb07fcc22063e
parent5432698c6b60544429fc974821107538f2cd3ee5
parent88ea5d21b92055ed8a8eae6e576abeb3cc7bf0e9
Merge "Allow factory reset when bluetooth is off (2/2)" am: de5fdee
am: 88ea5d2

* commit '88ea5d21b92055ed8a8eae6e576abeb3cc7bf0e9':
  Allow factory reset when bluetooth is off (2/2)

Change-Id: I835a04762ce9df854193775644f0468fc4c6a08e