diff options
author | The Android Open Source Project <initial-contribution@android.com> | 2010-02-05 08:46:19 -0800 |
---|---|---|
committer | Android Git Automerger <android-git-automerger@android.com> | 2010-02-05 08:46:19 -0800 |
commit | fa2de09c65fc50379eaffb22e71fb4b0474a3e22 (patch) | |
tree | 6e91c87d7b088574f2c45c9da83f45194c6f7745 | |
parent | 421bf12e09a569b81966c286cc7a7a6431a8b576 (diff) | |
parent | 8e2734af47b25e9727c745d4eb7c42fef0cb19b4 (diff) | |
download | extras-fa2de09c65fc50379eaffb22e71fb4b0474a3e22.tar.gz |
am 8e2734af: reconcile main tree with open-source eclair
Merge commit '8e2734af47b25e9727c745d4eb7c42fef0cb19b4' into eclair-plus-aosp
* commit '8e2734af47b25e9727c745d4eb7c42fef0cb19b4':
android-2.1_r1 snapshot
0 files changed, 0 insertions, 0 deletions