| commit | 5a27b3bb85acaa80c2ca8526299638c2082836fb | [log] [tgz] |
|---|---|---|
| author | Yaowu Xu <yaowu@google.com> | Thu Oct 22 12:18:52 2015 -0700 |
| committer | Yaowu Xu <yaowu@google.com> | Thu Oct 22 18:25:41 2015 -0700 |
| tree | 82e6430dd2fa6a094a65cf7a0d60ab10399228f2 | |
| parent | 4ac2ae3a4d593ae3128ab03daf1faff81e111159 [diff] |
Fix merge defects This commit fixes the merge conflicts between master and nextgenv2 and disable early termination in choose_tx_size() to avoid failure in test. The test failures are pre-existing, some of the issue were fixed in masterbase already, so will have another merge to introduce the fixes. Change-Id: Ib71889661955e73aedbb4db49d8be70425281dcb