| commit | ca4e5871bbd55a829757ba66eeb5e0366f938093 | [log] [tgz] |
|---|---|---|
| author | Robert Greenwalt <rgreenwalt@google.com> | Mon May 16 19:43:58 2016 +0000 |
| committer | android-build-merger <android-build-merger@google.com> | Mon May 16 19:43:58 2016 +0000 |
| tree | 2196d0db23b657964ed25a4ea8abe4e31de1a6a1 | |
| parent | 886bb996011668c43303bbcf21f4dde448041c8d [diff] | |
| parent | e08ba2f9883d0954c0adc32494fadd951a9a4ab0 [diff] |
resolve merge conflicts of c9badf1 to nyc-dev-plus-aosp am: 78e2c9c17f am: e08ba2f988 * commit 'e08ba2f9883d0954c0adc32494fadd951a9a4ab0': Fix misc-macro-parentheses warnings. Change-Id: I39114bf48f739ba5aaa9398afeb278844bb065c5