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

am c944e589: am fbe53add: reconcile main tree with open-source eclair 

Merge commit 'c944e589'

* commit 'c944e589':
  android-2.1_r1 snapshot
parents cc9b3cab c944e589
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