| commit | 55f36bbe612f3e16b302021900ec331a138b29bc | [log] [tgz] |
|---|---|---|
| author | Esteban de la Canal <estebandlc@google.com> | Wed Oct 14 21:24:06 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Wed Oct 14 21:24:06 2015 +0000 |
| tree | b07c964f450ef0ee3370eaaa5651a58c941f5c3b | |
| parent | bb4f0a2f4a333b10ca6b2dde1b721e78e27ad18d [diff] | |
| parent | f8ed7d3f0ea87b3fc1aa72859386c82d8d9bdbd4 [diff] |
am f8ed7d3f: Fixes unnecessary multi-merge steps. * commit 'f8ed7d3f0ea87b3fc1aa72859386c82d8d9bdbd4': Fixes unnecessary multi-merge steps.