am 88457c5c: am 3530ef81: reconcile main tree with open-source eclair

Browse Source

Merge commit '88457c5c5d4abdf0f99f19612db5d29c1f45ffa1'

* commit '88457c5c5d4abdf0f99f19612db5d29c1f45ffa1':
  android-2.1_r1 snapshot

...

This commit is contained in:

The Android Open Source Project

2010-02-05 14:26:00 -08:00

committed by Android Git Automerger

parent 7c6f96ceee 4d9f4905a9

commit 2c045c9893

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