am ccbd8955: (-s ours) am 0c53c5b6: Merge "Do not merge. This is a cherry-pick from froyo change I392406824607e2bdae646e3156433d82a9ed6521 Revise NotePad application to use better practices such as         - inflating menus from XML and supporting API Level 3 without the need  

Merge commit 'ccbd8955c0ce6c0bef32d531b6d8c607db7fb561'

* commit 'ccbd8955c0ce6c0bef32d531b6d8c607db7fb561':
  Do not merge.