commit | 5a44d55cb6343cc33fea7a70c68537a38e839aac | [log] [tgz] |
---|---|---|
author | Jean-Baptiste Queru <jbq@google.com> | Wed Jan 19 11:32:07 2011 -0800 |
committer | Jean-Baptiste Queru <jbq@google.com> | Wed Jan 19 11:32:12 2011 -0800 |
tree | 6c6a0fa945ec2663d6e5af562efa0dab49380625 | |
parent | fc85d2bcf07cd0ce885f220e17215736a5031946 [diff] | |
parent | c6a30aa4796d38c11d5c2f97507415ce209ebde8 [diff] |
Merge from gingerbread - do not merge Change-Id: I07cba4438a0e54384e27dd4b3593f58314474bd1