[automerger skipped] Merge "Move board-info props to vendor/build.prop" into...
[automerger skipped] Merge "Move board-info props to vendor/build.prop" into qt-dev am: 9ce8087a -s ours
am: 985f0387 -s ours
am skip reason: change_id I48642485bdc853884d465d1fe00f2ceae69a4736 with SHA1 c65ebaf6 is in history
Change-Id: I8bcf665b1993d9afec6ca571187d0bfb455dd90a