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

am c5718a3d: reconcile main tree with open-source eclair 

Merge commit 'c5718a3d' into eclair-plus-aosp

* commit 'c5718a3d':
  android-2.1_r1 snapshot
parents 3e4f2ed5 c5718a3d
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