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

am 198fe95b: reconcile main tree with open-source eclair 

Merge commit '198fe95b' into eclair-plus-aosp

* commit '198fe95b':
  android-2.1_r1 snapshot
parents 42309f82 198fe95b
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