| commit | 8003b9b6c8e9091fe74c1ce2193448f1cba6683d | [log] [tgz] |
|---|---|---|
| author | Jean-Baptiste Queru <jbq@google.com> | Fri Aug 10 12:46:37 2012 -0700 |
| committer | Jean-Baptiste Queru <jbq@google.com> | Fri Aug 10 12:46:37 2012 -0700 |
| tree | 5db3f681940f704df438f13754384468b99d8eb6 | |
| parent | 08d4f3a1420ec9ed70ef67fc9a662dd47bc353e5 [diff] | |
| parent | 2461b847d44e0dfa125b5d7c566a52d3da2eb1df [diff] |
resolved conflicts for merge of 2461b847 to jb-mr1-dev Change-Id: If6f3619904a44a71bd8814e00cfcfd96abdf534c