Commit 611a83b4 authored by The Android Open Source Project's avatar The Android Open Source Project Committed by Android Git Automerger
Browse files

am 9c3119ad: reconcile main tree with open-source eclair 

Merge commit '9c3119ad'

* commit '9c3119ad':
  android-2.1_r1 snapshot
parents 530cace4 9c3119ad
Show whitespace changes
Inline Side-by-side
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please to comment