am 8fbd4858: Merge "Remove tests for __LINE__ in nested multi-line macros." into...
authorKalle Raita <kraita@google.com>
Mon, 11 Jan 2016 19:36:24 +0000 (19:36 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Mon, 11 Jan 2016 19:36:24 +0000 (19:36 +0000)
am: a95a445f3c

* commit 'a95a445f3cee51ecbe201846ecfc95f22af0bf87':


Trivial merge