f99e2e042d
Merge commit '563bfade6601f3410681b3cd8b069ed22af5b048' into eclair-mr2-plus-aosp * commit '563bfade6601f3410681b3cd8b069ed22af5b048': fix a build breakage