| commit | e08ba2f9883d0954c0adc32494fadd951a9a4ab0 | [log] [tgz] |
|---|---|---|
| author | Chih-Hung Hsieh <chh@google.com> | Mon May 16 19:41:30 2016 +0000 |
| committer | android-build-merger <android-build-merger@google.com> | Mon May 16 19:41:30 2016 +0000 |
| tree | e2d5e6a9727b0884187feff68d16c8b5269bf7be | |
| parent | c0523c02e43cc31aa23d2d38058b53c0dc9d908f [diff] | |
| parent | 78e2c9c17f922cd2c8b3116fa6b228ea990d8f4b [diff] |
resolve merge conflicts of c9badf1 to nyc-dev-plus-aosp am: 78e2c9c17f * commit '78e2c9c17f922cd2c8b3116fa6b228ea990d8f4b': Fix misc-macro-parentheses warnings. Change-Id: I78cd4684a0cc020c6f85343f886b3868d7022c17