Merge from AOSP
Jean-Baptiste Queru [Fri, 1 Feb 2013 02:59:54 +0000 (18:59 -0800)]

Trivial merge