summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorThe Android Open Source Project <initial-contribution@android.com>2010-02-05 14:08:57 -0800
committerAndroid Git Automerger <android-git-automerger@android.com>2010-02-05 14:08:57 -0800
commit6bac3be5474605919f189eaa90c51d231d29ff83 (patch)
tree57148d64abb2192b6dbc4cac0870642d06c4c4c3
parent65bb5c3bf2ec4bdc7249513d3fedd4ea26a6a059 (diff)
parentf91bed8b6616d14bbc94fd63abcf6709d541ee39 (diff)
downloadsrec-6bac3be5474605919f189eaa90c51d231d29ff83.tar.gz
am f91bed8b: am ee67ee74: reconcile main tree with open-source eclair
Merge commit 'f91bed8b6616d14bbc94fd63abcf6709d541ee39' * commit 'f91bed8b6616d14bbc94fd63abcf6709d541ee39': android-2.1_r1 snapshot
0 files changed, 0 insertions, 0 deletions