tree 73ff404724eea051a6f658ccfefbb877984004b0
parent ed02c89e1e09c46276858ce1c5c2cf26c3354dd8
parent 262c261f453ff73c577302e13c3f6509bab2dda5
author Jean-Baptiste Queru <jbq@google.com> 1354128708 -0800
committer Jean-Baptiste Queru <jbq@google.com> 1354128713 -0800

Merge from AOSP

Change-Id: Ibb6386ef8d1e5aa4992d4b9dbeae4a259b917559