| commit | 1d6fa7af1288b550faabe4ec2cf98684236723db | [log] [tgz] |
|---|---|---|
| author | Narayan Kamath <narayan@google.com> | Tue Feb 11 13:47:53 2014 +0000 |
| committer | Narayan Kamath <narayan@google.com> | Tue Feb 11 13:53:20 2014 +0000 |
| tree | a8801ca9a0925ba1faccf17acea4aa78d71a9d29 | |
| parent | b82a9f105f89d6b3684c9f626918042bd8977912 [diff] | |
| parent | 566be7c33fc56ae4c34168ecbee5316374f7e3c5 [diff] |
resolved conflicts for merge of 566be7c3 to master Change-Id: I7b1cc71057b2bd4f771e7bcf508a8c3abd6017ce