am 97233468: reconcile main tree with open-source eclair

Browse Source

Merge commit '97233468715838e42b98abe047c60e108fcc44bd' into eclair-plus-aosp

* commit '97233468715838e42b98abe047c60e108fcc44bd': (198 commits)
  android-2.1_r1 snapshot
  ERD79
  ERD78
  ERD77D
  ERD77C
  ERD77B
  ERD77
  ERD76
  ERD75
  ERD72
  ERD71F
  ERD71E
  ERD71D
  ERD71C
  ERD71B
  ERD71
  ERD70B
  ERD70
  ERD69
  ERD68B
  ...

...

This commit is contained in:

The Android Open Source Project

2010-02-05 08:43:41 -08:00

committed by Android Git Automerger

parent 20d93db18d 9723346871

commit f925cb322e

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download Patch File Download Diff File Expand all files Collapse all files

Diff Content Not Available