25c70dd9a1
Merge commit '279ba943553ec2368d14e1b3c8a88c36bf17785d' into eclair-plus-aosp * commit '279ba943553ec2368d14e1b3c8a88c36bf17785d': Fix a warning output.