| commit | 6d6d58645557632c026f7eaa99ebbb47c929ccb9 | [log] [tgz] |
|---|---|---|
| author | Jean-Baptiste Queru <jbq@google.com> | Tue Feb 19 13:12:58 2013 -0800 |
| committer | Jean-Baptiste Queru <jbq@google.com> | Tue Feb 19 13:12:58 2013 -0800 |
| tree | 423ce38a25257e22e579c8db2183ff9c0cc5c195 | |
| parent | 65ddd755d52f1182a1fc07a69b9029b2cb976161 [diff] | |
| parent | a722065c55357f2f6827b42ecbda6e97728b71e3 [diff] |
resolved conflicts for merge of a722065c to master Change-Id: I3db0cabafc0f505d96deacff58d56fc4827e3f2e