summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorThe Android Open Source Project <initial-contribution@android.com>2010-02-05 14:18:32 -0800
committerAndroid Git Automerger <android-git-automerger@android.com>2010-02-05 14:18:32 -0800
commitc1261b11c546c1a87ad6755fcc224ea0a54d75ea (patch)
treec480c13897eae01114fc193bb034245c4045e49a
parentad7eeba2ca564f4dc9a1900d94647da30734e3fb (diff)
parent3d7637e8f95bd7d4fcaf44d7a1663bb7290772c6 (diff)
downloadneven-c1261b11c546c1a87ad6755fcc224ea0a54d75ea.tar.gz
am 3d7637e8: am dbf94ec6: reconcile main tree with open-source eclair
Merge commit '3d7637e8f95bd7d4fcaf44d7a1663bb7290772c6' * commit '3d7637e8f95bd7d4fcaf44d7a1663bb7290772c6': android-2.1_r1 snapshot
0 files changed, 0 insertions, 0 deletions