aboutsummaryrefslogtreecommitdiff
path: root/apps
diff options
context:
space:
mode:
authorThe Android Open Source Project <initial-contribution@android.com>2010-02-05 14:21:53 -0800
committerAndroid Git Automerger <android-git-automerger@android.com>2010-02-05 14:21:53 -0800
commit1abc6e8868de805bdf1d80f4253657e52cf1a291 (patch)
tree11849709456decba14c76cf274e4dcc72cab5784 /apps
parent3ed4ae613b89ab29ac8c801e30a98ffc7c6007e1 (diff)
parent1cd49f1559cf2c3b0cb1294b3787c5ddb3562c8d (diff)
downloadsample-1abc6e8868de805bdf1d80f4253657e52cf1a291.tar.gz
am 1cd49f15: am e2b8d31c: reconcile main tree with open-source eclair
Merge commit '1cd49f1559cf2c3b0cb1294b3787c5ddb3562c8d' * commit '1cd49f1559cf2c3b0cb1294b3787c5ddb3562c8d': android-2.1_r1 snapshot
Diffstat (limited to 'apps')
0 files changed, 0 insertions, 0 deletions