| commit | 9b07277b925e34e6bced3f4057b3b487b9468468 | [log] [tgz] |
|---|---|---|
| author | Scott Main <smain@google.com> | Wed Oct 20 13:54:47 2010 -0700 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Wed Oct 20 13:54:47 2010 -0700 |
| tree | 7696e2da92601898d723a4fe1447a7c938764a42 | |
| parent | ddb133f4a9d1e2f75f99c148e8218e43682b40a2 [diff] | |
| parent | 0702c101253807064c177cdbfca80391b1a26aea [diff] |
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. - to NOT include Merge commit '0702c101253807064c177cdbfca80391b1a26aea' into gingerbread-plus-aosp * commit '0702c101253807064c177cdbfca80391b1a26aea': Do not merge.