am a4fb8b3d: am c2bc66d4: Merge "Dont persist config on failure" into gingerbread
am a4fb8b3d: am c2bc66d4: Merge "Dont persist config on failure" into gingerbread

Merge commit 'a4fb8b3de37d57809665fa4113ebee9c8f2cc2fc'

* commit 'a4fb8b3de37d57809665fa4113ebee9c8f2cc2fc':
  Dont persist config on failure

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