diff options
author | The Android Open Source Project <initial-contribution@android.com> | 2010-02-05 14:18:27 -0800 |
---|---|---|
committer | Android Git Automerger <android-git-automerger@android.com> | 2010-02-05 14:18:27 -0800 |
commit | ba7043e3a57c39c3f30c29fd00c2b568f54e3d3f (patch) | |
tree | ffd7afec49ee2fd5aa8d6af63f00f5d84de94a67 | |
parent | 00bed653ca0ba41de3b20508f53254c78cac1f4a (diff) | |
parent | fb0447e72c641b2f81e39d2a238e289cf9f26825 (diff) | |
download | IM-ba7043e3a57c39c3f30c29fd00c2b568f54e3d3f.tar.gz |
am fb0447e7: am f934e0dc: reconcile main tree with open-source eclair
Merge commit 'fb0447e72c641b2f81e39d2a238e289cf9f26825'
* commit 'fb0447e72c641b2f81e39d2a238e289cf9f26825':
android-2.1_r1 snapshot
0 files changed, 0 insertions, 0 deletions