| commit | 0af2f46da7fcb8a38bb723067cd3555a4b0379c3 | [log] [tgz] |
|---|---|---|
| author | Jean-Baptiste Queru <jbq@google.com> | Mon May 21 14:22:19 2012 -0700 |
| committer | Jean-Baptiste Queru <jbq@google.com> | Mon May 21 14:22:19 2012 -0700 |
| tree | 22d171a16eaff1086abf557d0c9342bdac8c33d7 | |
| parent | 68373bf4841c93ca322806654c66f5939d4301d6 [diff] | |
| parent | 38e34874a89b6e71464bfa3e89480252000765ad [diff] |
resolved conflicts for merge of 38e34874 to master Change-Id: I7b8683be5a84c7c874e47876e8208a602f789320