diff options
author | The Android Open Source Project <initial-contribution@android.com> | 2010-02-05 14:16:10 -0800 |
---|---|---|
committer | Android Git Automerger <android-git-automerger@android.com> | 2010-02-05 14:16:10 -0800 |
commit | 827dabd0a79f27f083c46bbea2c93c4af9061fc5 (patch) | |
tree | 5da92f4786b58af392feae82228fbe1ddcc5d99a | |
parent | faeb50a924e219df689c16c57bb1b5ff1a095d62 (diff) | |
parent | c5908853dfd8ea68e81a17e4d57b1fdf76349373 (diff) | |
download | base-827dabd0a79f27f083c46bbea2c93c4af9061fc5.tar.gz |
am c5908853: am 1fb2a6cd: reconcile main tree with open-source eclair
Merge commit 'c5908853dfd8ea68e81a17e4d57b1fdf76349373'
* commit 'c5908853dfd8ea68e81a17e4d57b1fdf76349373':
android-2.1_r1 snapshot
0 files changed, 0 insertions, 0 deletions