am 05523fb0: (-s ours) Do not merge. Revise NotePad application to use better practices such as         - inflating menus from XML and supporting API Level 3 without the need         for version qualifiers on resource directories.         - to NOT include items in the options m

Merge commit '05523fb0b48280a5364908b00768ec71edb847a2' into gingerbread

* commit '05523fb0b48280a5364908b00768ec71edb847a2':
  Do not merge.