diff options
author | The Android Open Source Project <initial-contribution@android.com> | 2010-02-05 14:17:48 -0800 |
---|---|---|
committer | Android Git Automerger <android-git-automerger@android.com> | 2010-02-05 14:17:48 -0800 |
commit | 431ccc3e7f8540da36a8d07128a0c976918436b9 (patch) | |
tree | 04cbf6a39e8fefaa1fca927332fc04322366e2f8 | |
parent | 4529c93faf3d21913393a477f67864006afdc75f (diff) | |
parent | fa2de09c65fc50379eaffb22e71fb4b0474a3e22 (diff) | |
download | extras-431ccc3e7f8540da36a8d07128a0c976918436b9.tar.gz |
am fa2de09c: am 8e2734af: reconcile main tree with open-source eclair
Merge commit 'fa2de09c65fc50379eaffb22e71fb4b0474a3e22'
* commit 'fa2de09c65fc50379eaffb22e71fb4b0474a3e22':
android-2.1_r1 snapshot
0 files changed, 0 insertions, 0 deletions