tree 15bd15078fec4e0fc320b0d9f2e6ef41c239d4d5
parent 951e9a05ee8af86a7e0a5a5157a8baedbc8d4edf
parent 61eecbcb0560318e6e924ee9b5ef31a70219bd00
author Jean-Baptiste Queru <jbq@google.com> 1306963006 -0700
committer Jean-Baptiste Queru <jbq@google.com> 1306963008 -0700

Merge from gingerbread

Change-Id: I1181904c75e3adf014a0b2690bda7cfd49bd64a6