Merge commit '2a2058f5a31e3bace3d0284fb1259a9ddcbec3a5' into eclair * commit '2a2058f5a31e3bace3d0284fb1259a9ddcbec3a5': Add updated API diff based on 4.xml.
Merge commit '2a2058f5a31e3bace3d0284fb1259a9ddcbec3a5' into eclair * commit '2a2058f5a31e3bace3d0284fb1259a9ddcbec3a5': Add updated API diff based on 4.xml.