Alex Klyubin 24b1c64c5b resolve merge conflicts of bb3d77ba95 to master. ... Change-Id: Ib69e2a457c416b4da94fb76c231120632d47a07a		2016-01-22 11:05:03 -08:00
..
board	Merge "Remove special case handling of "ro." properties" am: 560fde999a	2016-01-13 18:50:00 +00:00
product	resolve merge conflicts of bb3d77ba95 to master.	2016-01-22 11:05:03 -08:00