am 4c97c59e: reconcile main tree with open-source eclair

Browse Source

Merge commit '4c97c59e3855f7766c25476f75a3b5b05ce54a9f' into eclair-plus-aosp

* commit '4c97c59e3855f7766c25476f75a3b5b05ce54a9f':
  android-2.1_r1 snapshot

main

The Android Open Source Project 2010-02-05 08:43:51 -08:00 committed by Android Git Automerger

parent fe4529657f 4c97c59e38

commit 02797369a9

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