am e70c6607: Merge "NPE in in AppGlobals#getIntCoreSetting" into honeycomb-mr1
am e70c6607: Merge "NPE in in AppGlobals#getIntCoreSetting" into honeycomb-mr1

* commit 'e70c6607e0316fe390d52a544f6832c60223881f':
  NPE in in AppGlobals#getIntCoreSetting

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