tree c56220cd14d1109005b04c1af135597ed2895823
parent 742b1fbd8b839bc2e93f9e8eb8caed1d990399d5
parent 0c53c5b6f6b449ad7bca14ebb4d650913650b219
author Scott Main <smain@google.com> 1288030629 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1288030629 -0700

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         for ve

Merge commit '0c53c5b6f6b449ad7bca14ebb4d650913650b219' into gingerbread-plus-aosp

* commit '0c53c5b6f6b449ad7bca14ebb4d650913650b219':
  Do not merge.