tree b3e4234ddd3bd29f38991a8c485e8cbc49e0783f
parent 4842dc6980fb830a4eef822e7d85beaab79ce2d2
parent 618ef6b2f5a2d3c29e4a76faa5abc5ebd5fa6fe3
author Jean-Baptiste Queru <jbq@google.com> 1297275838 -0800
committer Jean-Baptiste Queru <jbq@google.com> 1297275855 -0800

reconcile with gingerbread

Change-Id: Ifc4ad6e958423ee7058190a87949554f492cd4ce