| commit | ee82496e766d1a32162e772a2f46cd8a4f655d6e | [log] [tgz] |
|---|---|---|
| author | Chih-Hung Hsieh <chh@google.com> | Sat May 28 00:41:30 2016 +0000 |
| committer | android-build-merger <android-build-merger@google.com> | Sat May 28 00:41:30 2016 +0000 |
| tree | 03366e4b03c74d56ceccefebabfc8d3e89399c0c | |
| parent | 27fe9354852ddec6d04b27b293d2817e68507197 [diff] | |
| parent | ee736446bb2541094e20e76c1d2e6397a68d410f [diff] |
resolve merge conflicts of 5fb629a to nyc-mr1-dev-plus-aosp am: 496e073864 * commit '496e073864b3c08fb4d24152ceaad69f12d56ab3': Fix misc-macro-parentheses warnings in init and other core modules. Change-Id: Iae175962bca1b55bc44396445ab25de7c34a1652