| commit | 74fe74478c9112ab9fb042f1dfb0d9ac2b7ab9e2 | [log] [tgz] |
|---|---|---|
| author | Nicolas Geoffray <ngeoffray@google.com> | Fri Sep 11 16:07:29 2015 +0000 |
| committer | Nicolas Geoffray <ngeoffray@google.com> | Fri Sep 11 16:07:29 2015 +0000 |
| tree | 3c45593c4c1f1400873e32916a1357b2766dadf7 | |
| parent | 964d093874aa3533aaf899429dc3820f0fdef4e6 [diff] |
Revert "Fixes unnecessary multi-merge steps." Breaks continuous libcore tests. This reverts commit 964d093874aa3533aaf899429dc3820f0fdef4e6. Change-Id: Ic22b473094425b4dbf5a15a6e1a4c9f66b1b4001