| commit | ed461faab1f43e1bc8f3af88501e5a9d55e99355 | [log] [tgz] |
|---|---|---|
| author | Nick Kralevich <nnk@google.com> | Mon Jul 14 11:31:42 2014 -0700 |
| committer | Clay Murphy <claym@google.com> | Thu Jul 17 14:02:30 2014 -0700 |
| tree | 5b0644f0b997017decd27ca57fb24cfeb377a7ad | |
| parent | 0f08c6799754d86d38cd40ddf498d6aaf699f80e [diff] |
resolved conflicts for merge of faacd24c to master Change-Id: I08bf856b34a03d6eaa9f5de1470ab5cc8dc1277b Conflicts: src/devices/devices_toc.cs