tree b60da6c8c40f73796fb700626b8917375c7b4041
parent 4164387e863a8759e5f0e0658d67ab88eeced0a2
parent 07a30ef34b9f3ccb293c8be90abdaf75d65f026e
author Jean-Baptiste Queru <jbq@google.com> 1296326289 -0800
committer Jean-Baptiste Queru <jbq@google.com> 1296326289 -0800

Merge eab0e97b from gingerbread

Change-Id: Ibbe49137775b58ba0961fadd945c05acfcd1ce61