tree 5b0644f0b997017decd27ca57fb24cfeb377a7ad
parent 0f08c6799754d86d38cd40ddf498d6aaf699f80e
author Nick Kralevich <nnk@google.com> 1405362702 -0700
committer Clay Murphy <claym@google.com> 1405630950 -0700

resolved conflicts for merge of faacd24c to master

Change-Id: I08bf856b34a03d6eaa9f5de1470ab5cc8dc1277b

Conflicts:
	src/devices/devices_toc.cs