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

am fbe53add: reconcile main tree with open-source eclair 

Merge commit 'fbe53add' into eclair-plus-aosp

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