tree 22f0f16e78529bcf11773b4f22a37fbcd458a4d6
parent 5f3ba16de02de7e36b11117d455e1c64e231cd3f
parent 6b739dc7292452227cdd8abd90658f4db8f0ce70
author Jean-Baptiste Queru <jbq@google.com> 1296334751 -0800
committer Jean-Baptiste Queru <jbq@google.com> 1296334760 -0800

Merge 6b739dc7 from gingerbread

Change-Id: If94889da67977aff7daa1e201c10cd51b7e2fff8