tree 2c92e194a4753e272397e00af78586aaf987ef31
parent c1705c9ad8da4d6c2d267e27afd6e16aa7b431b6
parent 8cbdef7eba1ef83d009326aaba750e78f68b061f
author Jean-Baptiste Queru <jbq@google.com> 1306962564 -0700
committer Jean-Baptiste Queru <jbq@google.com> 1306962568 -0700

Merge from gingerbread

Change-Id: If6c009d62eb4b2ed931d3e5082d08ad996aca689