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