commit | 60d10ec91aa9de6b4699a87557ba8f041bf34be3 | [log] [tgz] |
---|---|---|
author | Lorenzo Colitti <lorenzo@google.com> | Mon May 02 09:43:05 2011 -0700 |
committer | Jean-Baptiste Queru <jbq@google.com> | Mon May 02 10:09:48 2011 -0700 |
tree | a9e84dc34172328627c5a93ce6068306e603cdff | |
parent | 08929fd6715b2b6a02f25b23704923d98c15a3b9 [diff] | |
parent | 3b1530aef62476248825a2092c9aea800395c3b1 [diff] |
Merge from gingerbread - do not merge Change-Id: I3529a5f85d93e66aa5fca62ac44c242c4f7e163d