Merge from AOSP staging branch
Jean-Baptiste Queru [Tue, 18 Dec 2012 23:15:36 +0000 (15:15 -0800)]
Change-Id: I757d7389ccc8912dff89a76e038bab9c03d7af1a


Trivial merge