Update board-info.txt

Change-Id: Ia4d644b77a7617a608503d40362143d96f8ae891
Reconcile with AOSP

Change-Id: I147da3a9ba69aad6402b4c40615ab7b871e78c95
Strip board-info.txt for AOSP

Change-Id: I5948210c1a1428ed9cb4f8a8319bfe43e0f76a44
Reconcile with AOSP

Change-Id: Ie9453a953131b58d303c567493915cb98b652a58
merge in jb-mr0-release history after reset to jb-dev
Merge android-4.1.2_r1

Conflicts:
	board-info.txt

Change-Id: I4e40d3ff4f7683f408fbe1946691b9799e13dba6