Merge from AOSP
authorJean-Baptiste Queru <jbq@google.com>
Fri, 1 Feb 2013 02:59:54 +0000 (18:59 -0800)
committerJean-Baptiste Queru <jbq@google.com>
Fri, 1 Feb 2013 02:59:54 +0000 (18:59 -0800)
commit46c8281eb228e84c9c4fe31bdfed1e2e75f33efb
tree27f3ff09c9f498961d1f4e5959160993912d56f2
parent48d026462152e1c12b689bb0a656bad6db82deb9
parent604b45a0c202c551332380cba09e65520569db25
Merge from AOSP