commit | c717a3f6d81b9d734fbaaaeede155305658c012b | [log] [tgz] |
---|---|---|
author | Scott Main <smain@google.com> | Tue Dec 07 14:14:20 2010 -0800 |
committer | Android (Google) Code Review <android-gerrit@google.com> | Tue Dec 07 14:14:20 2010 -0800 |
tree | d3a505378e2c7edf22b14845d34a097e1620d787 | |
parent | 14514c62035de6a04bc89152a28194de5f8b51e1 [diff] | |
parent | a00a0e7f7de72883f6f1523e989a7c1d18ac53b7 [diff] |
Merge "This is a manual merge of Ib7ea41079f3b268f3be1f86febdb1caed98bdd8e Which includes the following: - 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 menu based on the 'selected' item (that's what a context menu is for). - include all drawables in the app, instead of using system resources."