commit | 4b4babc89eee20d614ccbb5217b1544626959614 | [log] [tgz] |
---|---|---|
author | The Android Open Source Project <initial-contribution@android.com> | Fri Feb 05 08:44:09 2010 -0800 |
committer | Android Git Automerger <android-git-automerger@android.com> | Fri Feb 05 08:44:09 2010 -0800 |
tree | e2ab362c2ceafa20b35797160659ef1595b586a8 | |
parent | 41fd9152e2dcf739b24e5ae8defdb1ee42c589c2 [diff] | |
parent | dbbd8aed7ea208bda62db316dd31900b938fabfa [diff] |
am dbbd8aed: reconcile main tree with open-source eclair Merge commit 'dbbd8aed7ea208bda62db316dd31900b938fabfa' into eclair-plus-aosp * commit 'dbbd8aed7ea208bda62db316dd31900b938fabfa': android-2.1_r1 snapshot