Merge commit '94dab9b13590b714a7400d513f1e4655c62ddfaf' into gingerbread-plus-aosp * commit '94dab9b13590b714a7400d513f1e4655c62ddfaf': fix broken api/current.xml
Merge commit '94dab9b13590b714a7400d513f1e4655c62ddfaf' into gingerbread-plus-aosp * commit '94dab9b13590b714a7400d513f1e4655c62ddfaf': fix broken api/current.xml