| commit | 263a1e9f5861386b706456ba5321bd1309c5d8d5 | [log] [tgz] |
|---|---|---|
| author | David Gross <dgross@google.com> | Mon Apr 18 22:37:16 2016 +0000 |
| committer | android-build-merger <android-build-merger@google.com> | Mon Apr 18 22:37:16 2016 +0000 |
| tree | d1d176c163d85964a70a74ac9622dc9fc72c7edf | |
| parent | 1a7f21fff6d8740cb5e770cb3b6b58ebdd2a8f46 [diff] | |
| parent | cf71a21b88e74e04c38cfd83cb549f2a66bb7ba0 [diff] |
resolve merge conflicts of 1726942 to nyc-dev-plus-aosp am: ca4b041 am: cf71a21 * commit 'cf71a21b88e74e04c38cfd83cb549f2a66bb7ba0': Preserve generalized reduction combiner function for use by driver. Change-Id: I6b28bd686bf55bf10ed3c7f577a9330e7befdfa9