| commit | c6694b4cb4829164cd490869c557103f310fd761 | [log] [tgz] |
|---|---|---|
| author | Jesse Hall <jessehall@google.com> | Tue Oct 15 17:22:33 2013 -0700 |
| committer | Jesse Hall <jessehall@google.com> | Tue Oct 15 17:22:33 2013 -0700 |
| tree | f6529e7fba9c79526221f279719bb49d232c155e | |
| parent | e276feb813b06cbd7b89b37bd5361748dc43cfda [diff] | |
| parent | e94d204ab08a941f43df6bcb7a86f7e457fb83ae [diff] |
resolved conflicts for merge of e94d204a to master Change-Id: Idb2030dbb25a2e4b972492587558b25a305e68bd