tree 0374e1d9af54b441c2f26115b34d6d594a3f3e46
parent be1d4db0862c8d9e40386dc5c9739c1803f25eca
parent af16d11685e040b0cf332e729f8f4a0ab6ef0e16
author Zhihai Xu <zhihaixu@google.com> 1394392490 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1394392490 +0000

am af16d116: am 91f01220: DO NOT MERGE trouble syncing with fitbit and can\'t turn off bluetooth.

* commit 'af16d11685e040b0cf332e729f8f4a0ab6ef0e16':
  DO NOT MERGE trouble syncing with fitbit and can't turn off bluetooth.