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

* commit '5a2c6fbf847af971457f014ce7073812c9dd31e7':
  NPE in in AppGlobals#getIntCoreSetting