reconcile main tree with open-source eclair
authorThe Android Open Source Project <initial-contribution@android.com>
Fri, 5 Feb 2010 16:09:38 +0000 (08:09 -0800)
committerThe Android Open Source Project <initial-contribution@android.com>
Fri, 5 Feb 2010 16:09:38 +0000 (08:09 -0800)
commit3530ef81d13e243bb568b8d33327f5fdda8a5b1a
tree4f3ee983f1d3635ca731841483aad0d798318121
parent2d319172300af10e139818ea367c4afc14c616f5
parent9e0489f1371401197d5a59c4bbbd803a64aff9e8
reconcile main tree with open-source eclair