Adam Powell ffd4163fc6 Fix bogus current.txt merge
Change-Id: Id60b61f16a47c11626829c4b50fe712acc5723b7
2014-07-10 17:02:00 -07:00
..
2014-07-10 17:02:00 -07:00