| commit | 8c9cf8526e7c2e3b094f819b4d79ad622760ce96 | [log] [tgz] |
|---|---|---|
| author | Chih-Hung Hsieh <chh@google.com> | Thu May 19 23:08:56 2016 +0000 |
| committer | android-build-merger <android-build-merger@google.com> | Thu May 19 23:08:56 2016 +0000 |
| tree | b5b29fb7f20f1a6f2eb4371fec3e3e1516ab2ba8 | |
| parent | 47ab61bcc2404c8b1273ac11641f1ff7cbddae0b [diff] | |
| parent | 50137f2c80d39531950095d58f19410a2d7e2cd7 [diff] |
resolve merge conflicts of 3252d11 to nyc-dev-plus-aosp am: daa13eaa92 * commit 'daa13eaa922670e08cc1a88a04b189e003dcf9ec': Fix misc-macro-parentheses warnings in lmkd. Change-Id: I4488f937aac2a3bdd8e52f667f30b4dc5836f3ab