Commit Graph

2 Commits

Author SHA1 Message Date
Steven Moreland
70f34a6330 Adding all nfc vts related things back.
Test: none
Merged-In: I84a42ae27d36a5479f2ca859849bb1b4536bdbad
Change-Id: I84a42ae27d36a5479f2ca859849bb1b4536bdbad
2017-01-18 11:15:11 -08:00
Steven Moreland
7a4f118c48 Stop all these merge conflicts.
Test: mma -j64
Change-Id: I319198af32adf1fef180c5c2c22ba4b360fa7609
2016-10-26 12:05:29 +02:00