commit | f5b4e6bab4e98db8b3bc356c6a77f53824eddad1 | [log] [tgz] |
---|---|---|
author | Scott Main <smain@google.com> | Thu Dec 03 16:14:13 2009 -0800 |
committer | Android Git Automerger <android-git-automerger@android.com> | Thu Dec 03 16:14:13 2009 -0800 |
tree | fa9d11aeace2bd62c163d2920f5cc2d1c8d6cee8 | |
parent | 04710b1b3eaae3c9690e521e0bc669fffbc7aeff [diff] | |
parent | 6360ea394c92266498bbf09e6c1b210b99634862 [diff] |
Merge branch 'eclair-mr2' of ssh://android-git.corp.google.com:29418/platform/frameworks/base into eclair-mr2