commit | 0896ce1e7b7418350e9f6ca9b4b9ad675ccb9b86 | [log] [tgz] |
---|---|---|
author | Jean-Baptiste Queru <jbq@google.com> | Fri Jun 24 13:22:43 2011 -0700 |
committer | Jean-Baptiste Queru <jbq@google.com> | Fri Jun 24 13:22:59 2011 -0700 |
tree | 8370fe570053c68f1d0eeac457c2465fd11e8df7 | |
parent | a4f65ce780e319268a9f300a9edbc07657adff0a [diff] | |
parent | cd3762b406d94951a2372e1c08b0f5e3afe8531a [diff] |
Merge from gingerbread - do not merge Change-Id: Iba2f457ca4e8ea90078d1028e1ea829b3d889285