am 8eac3b2f: am 0f70e482: Merge "Fix issue #5470311: Activity with android:configChanges defined..." into ics-mr1

* commit '8eac3b2f1ae4b155bd159317e9f221223189ba26':
  Fix issue #5470311: Activity with android:configChanges defined...