am 8fbd4858: Merge "Remove tests for __LINE__ in nested multi-line macros." into...
authorKalle Raita <kraita@google.com>
Wed, 10 Jun 2015 23:15:37 +0000 (23:15 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Wed, 10 Jun 2015 23:15:37 +0000 (23:15 +0000)
* commit '8fbd4858011144feee50cf2cc2ca5faa076d8c71':
  Remove tests for __LINE__ in nested multi-line macros.


Trivial merge