tree e699648a4eaffbafbb3e135917fac12debec7714
parent 8d58c957036835db148acc4e506633a016dc6c7e
parent 7172eb7b623f4b30f5a709d639fcd3fb51cd6220
author Jean-Baptiste Queru <jbq@google.com> 1306962484 -0700
committer Jean-Baptiste Queru <jbq@google.com> 1306962495 -0700

Merge from gingerbread

Change-Id: I30902cdb19698f88a1ea57cf8c7667ef867d13a8