| commit | 8d51f150d89d4c7f4bd53ef85ef86f4c19d9221d | [log] [tgz] |
|---|---|---|
| author | The Android Open Source Project <initial-contribution@android.com> | Fri Feb 05 14:10:01 2010 -0800 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Fri Feb 05 14:10:01 2010 -0800 |
| tree | a5d3ea486b907c77abd820d7df12fb224ed0a417 | |
| parent | 5d2dd34bd60b3dc33981018dc0adc3a7020b4bef [diff] | |
| parent | cc4d7d89e9d47a5b6e0bc00881f60bb619d32714 [diff] |
am cc4d7d89: am 5bbcf18e: reconcile main tree with open-source eclair Merge commit 'cc4d7d89e9d47a5b6e0bc00881f60bb619d32714' * commit 'cc4d7d89e9d47a5b6e0bc00881f60bb619d32714': android-2.1_r1 snapshot