commit | 9f0fa1f4c1ed8499bf53479cf51c440a8f665d5e | [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 | 828b7d3d1b0a6e946e33c1a39baa6a9d510484fa | |
parent | e08361d7fda2234f447f4ffb7f480d045f8c5f78 [diff] | |
parent | 805cc709b7852d209b122dfe7bf5d42dbd44e393 [diff] |
Merge branch 'eclair-mr2' of ssh://android-git.corp.google.com:29418/platform/frameworks/base into eclair-mr2