OSDN Git Service

Merge \\\\"Stop #define\\\\'ing __func__ and __restrict.\\\\" am: e656a3acaf am:...
authorElliott Hughes <enh@google.com>
Mon, 25 Jul 2016 22:56:06 +0000 (22:56 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Mon, 25 Jul 2016 22:56:06 +0000 (22:56 +0000)
am: ccd0c3aa49

Change-Id: I8976b1b49ed809aa338df49c0352e1809ab881e3


Trivial merge