Merge commit '7c8258d064efe70e8551480eaafd7296f659acd5' into gingerbread-plus-aosp * commit '7c8258d064efe70e8551480eaafd7296f659acd5': Fix the last remaining @deprecated tag without comment warning.
Merge commit '7c8258d064efe70e8551480eaafd7296f659acd5' into gingerbread-plus-aosp * commit '7c8258d064efe70e8551480eaafd7296f659acd5': Fix the last remaining @deprecated tag without comment warning.