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

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

Merge commit '0cb42851' into eclair-plus-aosp

* commit '0cb42851':
  android-2.1_r1 snapshot
parents 8199f491 0cb42851
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