Merge commit '05eca1d46a45723a57899dabad698537b7faef82' into eclair-plus-aosp * commit '05eca1d46a45723a57899dabad698537b7faef82': DO NOT MERGE: Squashed commit of the following:
Merge commit '05eca1d46a45723a57899dabad698537b7faef82' into eclair-plus-aosp * commit '05eca1d46a45723a57899dabad698537b7faef82': DO NOT MERGE: Squashed commit of the following: