fe11d1a7a5
Merge commit '43e9eb28ab9a246472149384567f505434f492a3' into eclair-mr2-plus-aosp * commit '43e9eb28ab9a246472149384567f505434f492a3': Fix build.