OSDN Git Service

am 23453997: (-s ours) am 4c938b5d: am af16d116: am 91f01220: DO NOT MERGE trouble...
authorZhihai Xu <zhihaixu@google.com>
Sun, 9 Mar 2014 19:19:05 +0000 (19:19 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Sun, 9 Mar 2014 19:19:05 +0000 (19:19 +0000)
commitf98ff2a1d1a6542fd27c98d54fce36b749086cf4
tree0f23dc8468c2e679eec79a1da37784e2f8ceeb01
parenta31bd35aeae1b5772ec1fa84c2aff02bb133ea6e
parent23453997998d19ab3fd66ab5015fc218b3a1bba6
am 23453997: (-s ours) am 4c938b5d: am af16d116: am 91f01220: DO NOT MERGE trouble syncing with fitbit and can\'t turn off bluetooth.

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