Merge "Add support for extra lines in BuildConfig."
Xavier Ducrohet [Fri, 31 Aug 2012 19:59:37 +0000 (12:59 -0700)]

Trivial merge