| commit | 2f65b2263d3712f4cc02df34bea3f69f81ec6f89 | [log] [tgz] |
|---|---|---|
| author | Tyler Gunn <tgunn@google.com> | Thu Feb 06 13:33:25 2014 -0800 |
| committer | Tyler Gunn <tgunn@google.com> | Thu Feb 06 13:33:25 2014 -0800 |
| tree | 996477edf7f6fed4836fe1fb4e1a76b5ba0c0a27 | |
| parent | 784b1e7848cf062b68c3d1db70ddff0149cef745 [diff] | |
| parent | 45ed3b5932ed590b45235d7b2befa736a95e7f75 [diff] |
resolved conflicts for merge of 45ed3b59 to master-nova Change-Id: I65fe25b53aa145585a9c7471c699d4c6f5fb7def