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