tree c822c5e786f0d9e7b03969413f1b576915e79786
parent 3f8d6fbb0986096be2b72cc92cfd722203274bee
parent 5d565c11c167312e65bcd1431885ffc8180d5835
author Lorenzo Colitti <lorenzo@google.com> 1304356545 -0700
committer Jean-Baptiste Queru <jbq@google.com> 1304356549 -0700

Merge from gingerbread

Change-Id: Ibc0d1ab94e796f1b3f4fb67d5c22514ce87fa399