| commit | d7792759e703200c833736df276915958588cad4 | [log] [tgz] |
|---|---|---|
| author | David Friedman <dmail@google.com> | Tue Aug 18 05:00:50 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Tue Aug 18 05:00:50 2015 +0000 |
| tree | cf0c7d17559d37fa5c822f9c4785c4c8077c675f | |
| parent | b59404a1f590091f0c3cd22b69de1b55154ef580 [diff] | |
| parent | 5f89ce649c6385bd6463641c5408cc7a274b0eb6 [diff] |
am 5f89ce64: am 3e40a27e: Merge "Docs: Fixing files that didn\'t merge properly from mnc-preview-docs" into mnc-dev * commit '5f89ce649c6385bd6463641c5408cc7a274b0eb6': Docs: Fixing files that didn't merge properly from mnc-preview-docs