am 59ef9b0d: am cb4c0af3: am 46814fbf: Merge "Override Body Sensors string for watches" into cw-e-dev
am 59ef9b0d: am cb4c0af3: am 46814fbf: Merge "Override Body Sensors string for watches" into cw-e-dev

* commit '59ef9b0d80dfde4d257d8adef7350a9850c4b69d':
  Override Body Sensors string for watches

xorware/android_frameworks_base,xorware/android_frameworks_base,xorware/android_frameworks_base,xorware/android_frameworks_base,xorware/android_frameworks_base,xorware/android_frameworks_base