summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorThe Android Open Source Project <initial-contribution@android.com>2010-02-05 14:18:41 -0800
committerAndroid Git Automerger <android-git-automerger@android.com>2010-02-05 14:18:41 -0800
commit0e2df22b763fb8d73fcdbc9c417bb8ba1205f042 (patch)
tree5a196250a7b7793e6e7190bdfc659b49f596c7da
parentcf6df894fa8fbda563a8bf836f47b0f12d663c84 (diff)
parent2836cc573a12cbe12e7d2fce7468c1a83374e510 (diff)
downloadlegacy-0e2df22b763fb8d73fcdbc9c417bb8ba1205f042.tar.gz
am 2836cc57: reconcile main tree with open-source eclair
Merge commit '2836cc573a12cbe12e7d2fce7468c1a83374e510' * commit '2836cc573a12cbe12e7d2fce7468c1a83374e510': android-2.1_r1 snapshot
0 files changed, 0 insertions, 0 deletions