| commit | e06f158cbab3dd326f44ed4ef552b77e3dafe4ea | [log] [tgz] |
|---|---|---|
| author | Chih-Hung Hsieh <chh@google.com> | Fri May 20 00:21:29 2016 +0000 |
| committer | android-build-merger <android-build-merger@google.com> | Fri May 20 00:21:29 2016 +0000 |
| tree | c7dc9c1050390e648bc7425b349ce41c292b93ec | |
| parent | c0f679e5a1cf74041a71eba681dece3b8bc88004 [diff] | |
| parent | 8c9cf8526e7c2e3b094f819b4d79ad622760ce96 [diff] |
resolve merge conflicts of 3252d11 to nyc-dev-plus-aosp am: daa13eaa92 am: a343667388 * commit 'a343667388faf4f2edba9b3501c0dd75e2716d4a': Fix misc-macro-parentheses warnings in lmkd. Change-Id: I0f53c196bf3f44dd856379e29cfc5700139995ae