am da846fcf: am 4c382b13: reconcile main tree with open-source eclair

Browse Source

Merge commit 'da846fcf1b6a7bbd2f9f30c965b25f084568ef75'

* commit 'da846fcf1b6a7bbd2f9f30c965b25f084568ef75':
  android-2.1_r1 snapshot

...

This commit is contained in:

The Android Open Source Project 2010-02-05 14:09:04 -08:00 committed by Android Git Automerger

parent e08991e02a da846fcf1b

commit 2e068dc330

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

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

Diff Content Not Available