tree 8c76bc87705d4ca31ffbd749dbdeaec8c47e7ffa
parent 9851c52c4a48d13dfe9b34b018f433cfcdb76eee
parent 66888a7c420f911574c59dd10d32f62bada91adb
author Jean-Baptiste Queru <jbq@google.com> 1296321881 -0800
committer Jean-Baptiste Queru <jbq@google.com> 1296321881 -0800

Merge 66888a7c from gingerbread

Change-Id: Ieba42e9ecfaf6078d2c8442560119863a329fa06