| commit | 0e55e3565ea4cadd11b0977b0a4f8ccce8281eb1 | [log] [tgz] |
|---|---|---|
| author | Nick Kralevich <nnk@google.com> | Tue Jan 06 11:27:36 2015 -0800 |
| committer | Nick Kralevich <nnk@google.com> | Tue Jan 06 11:29:44 2015 -0800 |
| tree | 2acf8df06f2f59ced7fe7fc85dc3d110a4c2716c | |
| parent | 304ea5aac77cae03b4e8440a7c73c18086d96a20 [diff] | |
| parent | 1779fd1514873bda0bec514f97b568f8a5370dc1 [diff] |
resolved conflicts for merge of 1779fd15 to master Change-Id: I36b60b943a9cfe53bbbf455cf4e94579bfbfbc69