tree 5a4806ba3d70dc9f7e66fc9cc56a68891930d2c9
parent e62abe9385121cb91abea389bd08924a1c0ce25e
parent 60b67e274a7f4b57a6fedbf6eb3bafdf1cf738ab
author Jean-Baptiste Queru <jbq@google.com> 1306962940 -0700
committer Jean-Baptiste Queru <jbq@google.com> 1306962974 -0700

Merge from gingerbread

Change-Id: I7c675656cd203ebf2b3adc9396bc84f76495a6ed