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)
commit5aaef6f812b32c0e132279d828c9b3591a238ce5
treed6c53082ea78e5311feb5ca4cecb553830625441
parent667c17eae5c9a79a3ff5b8f5b6f106a8abe11766
parentccd0c3aa49b5066c7b30ab2cc60a76eaee371480
Merge \\\\"Stop #define\\\\'ing __func__ and __restrict.\\\\" am: e656a3acaf am: 28250109c2 am: e69f6d8d96
am: ccd0c3aa49

Change-Id: I8976b1b49ed809aa338df49c0352e1809ab881e3