| commit | 85948593e31157207660dcd144fa5dbe2e6b6585 | [log] [tgz] |
|---|---|---|
| author | Kristian Monsen <kristianm@google.com> | Thu Dec 12 23:59:37 2013 -0800 |
| committer | Kristian Monsen <kristianm@google.com> | Thu Dec 12 23:59:37 2013 -0800 |
| tree | bee2391a5feae54a74eb291da249ad0fd04c58a9 | |
| parent | b62063316e976dd2c41d784d697e326d93f0e71c [diff] | |
| parent | 800d4d722f7b6e46bbe5bcf113afccccfad8d8ca [diff] |
resolved conflicts for merge of 800d4d72 to master Change-Id: Ib1defc447745e5406d64c0d99c962832c79d15ef