| commit | 4dc3ff9ff9bfbeb1a1926a7e05769260aa6c5588 | [log] [tgz] |
|---|---|---|
| author | Esteban de la Canal <estebandlc@google.com> | Mon Sep 14 17:21:48 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Mon Sep 14 17:21:48 2015 +0000 |
| tree | 82a20b3428bd367eea367d00c2c6239bf8d956d5 | |
| parent | d2a775196be58fd9d7ac172b95b3b904da190ce5 [diff] | |
| parent | 55a3b73f0d834209ccb475d9683f54a51710e960 [diff] |
am 55a3b73f: Merge "Fixes unnecessary multi-merge steps." * commit '55a3b73f0d834209ccb475d9683f54a51710e960': Fixes unnecessary multi-merge steps.