OSDN Git Service

(root) / android-x86 / frameworks-base.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 871f9de 05bbeb3)
am 05bbeb35: am 7eb6ec1f: Merge change I18305fec into eclair
authorRoman Nurik <romannurik@google.com>
Fri, 11 Dec 2009 03:57:39 +0000 (19:57 -0800)
committerAndroid Git Automerger <android-git-automerger@android.com>
Fri, 11 Dec 2009 03:57:39 +0000 (19:57 -0800)
Merge commit '05bbeb356286bfb6ddc26ac546cce03334e346dd' into eclair-mr2-plus-aosp

* commit '05bbeb356286bfb6ddc26ac546cce03334e346dd':
  Add ContactManager, MultiResolution, Wiktionary, and WiktionarySimple to samples index. Also add latest samples zip file.


Trivial merge
frameworks/base
About OSDN
Find Software
Develop Software
Help