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

* commit 'f0dfa366de68f159cd41d8667395cfdabc046a65':
  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