diff options
author | The Android Open Source Project <initial-contribution@android.com> | 2010-02-05 08:46:37 -0800 |
---|---|---|
committer | Android Git Automerger <android-git-automerger@android.com> | 2010-02-05 08:46:37 -0800 |
commit | 3d7637e8f95bd7d4fcaf44d7a1663bb7290772c6 (patch) | |
tree | b321622187db63fbd219e5cb83c0006afcaf88be | |
parent | 9c269f4c6f27f15256d4a08ff1e3640b3c47b6fd (diff) | |
parent | dbf94ec67a1bd5ec9937962dbda1f735beffa248 (diff) | |
download | neven-3d7637e8f95bd7d4fcaf44d7a1663bb7290772c6.tar.gz |
am dbf94ec6: reconcile main tree with open-source eclair
Merge commit 'dbf94ec67a1bd5ec9937962dbda1f735beffa248' into eclair-plus-aosp
* commit 'dbf94ec67a1bd5ec9937962dbda1f735beffa248':
android-2.1_r1 snapshot
0 files changed, 0 insertions, 0 deletions