tree d6750e9636bf91d6de8ed967b7e4f13e29626272
parent 436deea5bbd43ae402ca8ee5bbc7fed3daaf3fce
parent a38ec2b7d4324965d55a020baf4ad8b979d69597
author Jean-Baptiste Queru <jbq@google.com> 1310506881 -0700
committer Jean-Baptiste Queru <jbq@google.com> 1310506898 -0700

Merge from gingerbread-plus-aosp

Change-Id: I55b84eda30edf0eade8b43712ab011cd3f65f0d9