am 72efb1ff: am 95f270de: am b63b031c: Merge "Standardize stateToString return values" into mnc-dev
am 72efb1ff: am 95f270de: am b63b031c: Merge "Standardize stateToString return values" into mnc-dev

* commit '72efb1ffb23e8f9bd46ad8ac71de61179a8446f6':
  Standardize stateToString return values

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