am f56aac4b: am d8cf2125: Merge "Add a way to get a string for an error code." into gingerbread
am f56aac4b: am d8cf2125: Merge "Add a way to get a string for an error code." into gingerbread

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