am 9b07277b: (-s ours) am 0702c101: 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.         - t

Merge commit '9b07277b925e34e6bced3f4057b3b487b9468468'

* commit '9b07277b925e34e6bced3f4057b3b487b9468468':
  Do not merge.