| commit | 41f78a408f5ad413ed553d2c45e5d46aca89ee56 | [log] [tgz] |
|---|---|---|
| author | David Friedman <dmail@google.com> | Tue Aug 18 05:14:12 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Tue Aug 18 05:14:12 2015 +0000 |
| tree | f3cc02a74623c3365a94d39ffef46ec30c11aad4 | |
| parent | e1e9e811ab06a85a6494bebca0f530c8f0ed7268 [diff] | |
| parent | 878acada08c49214b720fdd57b8150407a4e223f [diff] |
am 878acada: am d7792759: am 5f89ce64: am 3e40a27e: Merge "Docs: Fixing files that didn\'t merge properly from mnc-preview-docs" into mnc-dev * commit '878acada08c49214b720fdd57b8150407a4e223f': Docs: Fixing files that didn't merge properly from mnc-preview-docs