Merge commit '4749fcf762de0e34ac28f927501d42555062c521' into gingerbread-plus-aosp * commit '4749fcf762de0e34ac28f927501d42555062c521': More tricksy.
Merge commit '4749fcf762de0e34ac28f927501d42555062c521' into gingerbread-plus-aosp * commit '4749fcf762de0e34ac28f927501d42555062c521': More tricksy.