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

* commit '3753854c0b5b15291c2522425e94696f57bce45f':


Trivial merge