Merge "Remove tests for __LINE__ in nested multi-line macros." into mnc-dev
authorKalle Raita <kraita@google.com>
Wed, 10 Jun 2015 20:48:22 +0000 (20:48 +0000)
committerAndroid (Google) Code Review <android-gerrit@google.com>
Wed, 10 Jun 2015 20:48:23 +0000 (20:48 +0000)

Trivial merge