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


Trivial merge