| commit | 791fce20ee88597ea7cd64cc728010088a2e7a8f | [log] [tgz] |
|---|---|---|
| author | Chih-Hung Hsieh <chh@google.com> | Tue May 24 19:01:52 2016 +0000 |
| committer | android-build-merger <android-build-merger@google.com> | Tue May 24 19:01:52 2016 +0000 |
| tree | 541a6e2236aee28a6617cb4f34673fad36ac23bf | |
| parent | 1af43496f2086b222bfd711de07cf291393297c8 [diff] | |
| parent | a15b56e48406d8242e91629e748a1b90d5977381 [diff] |
resolve merge conflicts of 53529cf to nyc-dev-plus-aosp am: 4d1522bdc7 am: a15b56e484 * commit 'a15b56e48406d8242e91629e748a1b90d5977381': Fix misc-macro-parentheses warnings. Change-Id: I5fcae0f83f1f6820ec8da61c46e778e30353195f