OSDN Git Service

Merge "Docs: Fixing files that didn't merge properly from mnc-preview-docs" into...
authorDavid Friedman <dmail@google.com>
Tue, 18 Aug 2015 04:50:23 +0000 (04:50 +0000)
committerAndroid (Google) Code Review <android-gerrit@google.com>
Tue, 18 Aug 2015 04:50:23 +0000 (04:50 +0000)
commit3e40a27eaca9e82398f7dc59006c14e56de7cc43
tree6b8f2281c891b252198ee3b2ca232ed057fde0ba
parent610008c0ebf5ea4556b4825eac521b2b16f1a66c
parenteaabddf1219bbff2b12d2660ee94f42afd900cbe
Merge "Docs: Fixing files that didn't merge properly from mnc-preview-docs" into mnc-dev