OSDN Git Service

resolved conflicts for merge of 7044ee16 to mnc-preview-docs
authorDavid Friedman <dmail@google.com>
Fri, 22 May 2015 22:23:12 +0000 (15:23 -0700)
committerDavid Friedman <dmail@google.com>
Fri, 22 May 2015 22:23:12 +0000 (15:23 -0700)
commitdd4dc4a0bec72cbfae8a3b27c72d75e90d38c79b
tree7bda8771435143f267bddf1d7e326164cc01db2d
parentfe6d855cf3239558f780f91ded6679f54cd47661
parent7044ee162b730cb69e53aaa5e46500a1735a6b3e
resolved conflicts for merge of 7044ee16 to mnc-preview-docs

Change-Id: Ia0d831660d7744f34c68dba62e19a11c83ec2ee7
docs/html-ndk/ndk/guides/guides_toc.cs