tree 720eabd5fd655f22f8ed28f38879585b477afb89
parent 4794d8f3a9318e063cd08501ddf66fa767af0c19
parent a58e4068f86c6ca3f9771d4ec8b2665d070a170e
author Jean-Baptiste Queru <jbq@google.com> 1302204662 -0700
committer Jean-Baptiste Queru <jbq@google.com> 1302204672 -0700

Merge from gingerbread

Change-Id: Ic33eb4a67fdf638f2ba192d60b6a8cf6f9c72be7