am 5595acbe: Merge change Ice325f3b into eclair-mr2

Merge commit '5595acbed8ca1778a61881a00d7baaffecb2a64c' into eclair-mr2-plus-aosp

* commit '5595acbed8ca1778a61881a00d7baaffecb2a64c':
  Fix Notepadv3Solution orientation changes during NoteEdit