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