summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorThe Android Open Source Project <initial-contribution@android.com>2010-02-05 08:42:04 -0800
committerAndroid Git Automerger <android-git-automerger@android.com>2010-02-05 08:42:04 -0800
commita3a9c69b4956ad6c056fb331cd685478b9402ef5 (patch)
treeb3db00adab2a9a61fc29a807337d426a0e6e72a2
parent4f50ecc1cc90a03931e6cec0c89f5af44ab79f6b (diff)
parent87d1452b857460447250b8413d48e2c573f29bd6 (diff)
downloadomap3-a3a9c69b4956ad6c056fb331cd685478b9402ef5.tar.gz
am 87d1452b: reconcile main tree with open-source eclair
Merge commit '87d1452b857460447250b8413d48e2c573f29bd6' into eclair-plus-aosp * commit '87d1452b857460447250b8413d48e2c573f29bd6': android-2.1_r1 snapshot
0 files changed, 0 insertions, 0 deletions