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

am 2387b975: am 0cb42851: reconcile main tree with open-source eclair 

Merge commit '2387b975'

* commit '2387b975':
  android-2.1_r1 snapshot
parents 8a7c8b92 2387b975
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