Merge commit '2515cf85d50ef137a6e4a15a79a75a51c923ce6f' into eclair-mr2-plus-aosp * commit '2515cf85d50ef137a6e4a15a79a75a51c923ce6f':
This commit is contained in:
Merge commit '2515cf85d50ef137a6e4a15a79a75a51c923ce6f' into eclair-mr2-plus-aosp * commit '2515cf85d50ef137a6e4a15a79a75a51c923ce6f':