| commit | d2a775196be58fd9d7ac172b95b3b904da190ce5 | [log] [tgz] |
|---|---|---|
| author | Nicolas Geoffray <ngeoffray@google.com> | Fri Sep 11 22:14:00 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Fri Sep 11 22:14:00 2015 +0000 |
| tree | 0ead77a47682764d6386818d107536e68900aa9c | |
| parent | be967b814e0147ce8cbd20f301d26b41243166e9 [diff] | |
| parent | 2806b1f77f710810cc7f3a51e68642012fb43b8c [diff] |
am 2806b1f7: Merge "Revert "Fixes unnecessary multi-merge steps."" * commit '2806b1f77f710810cc7f3a51e68642012fb43b8c': Revert "Fixes unnecessary multi-merge steps."