| commit | ee41484147b1fc8628aa2acee3a636d48dbda84a | [log] [tgz] |
|---|---|---|
| author | Esteban de la Canal <estebandlc@google.com> | Thu Sep 10 23:50:32 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Thu Sep 10 23:50:32 2015 +0000 |
| tree | b1801f7cb1e5f59b547ea7c7535269c0990e6788 | |
| parent | bff7aeb516b39bbaf11f7e5328c0f72a1318c40f [diff] | |
| parent | aeaf593308ae6b75d32ad55d96de12d0664eb23d [diff] |
am aeaf5933: Merge "Fixes unnecessary multi-merge steps." * commit 'aeaf593308ae6b75d32ad55d96de12d0664eb23d': Fixes unnecessary multi-merge steps.