reconcile main tree with open-source eclair
authorThe Android Open Source Project <initial-contribution@android.com>
Fri, 5 Feb 2010 16:09:35 +0000 (08:09 -0800)
committerThe Android Open Source Project <initial-contribution@android.com>
Fri, 5 Feb 2010 16:09:35 +0000 (08:09 -0800)
commitad0598511cdd00928c697b3fc35de4057701bc7c
tree11bf6c9787dbc64034beba750e2e46d54d2a1c19
parent0b0080a126eb8175b9138c02c18f8df3818a3292
parent10697fe75b6fe30c0c220a746cb47cd81932d220
reconcile main tree with open-source eclair