OSDN Git Service

am dd4dc4a0: resolved conflicts for merge of 7044ee16 to mnc-preview-docs
authorDavid Friedman <dmail@google.com>
Fri, 22 May 2015 22:32:19 +0000 (22:32 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Fri, 22 May 2015 22:32:19 +0000 (22:32 +0000)
commiteed8e782ec22a11957c563e79010794571d43be9
tree9d07384048b9349a817b69635317f60471bf2baf
parentd2632a83668001065e6de9d38cc7166f309a2ca3
parentdd4dc4a0bec72cbfae8a3b27c72d75e90d38c79b
am dd4dc4a0: resolved conflicts for merge of 7044ee16 to mnc-preview-docs

* commit 'dd4dc4a0bec72cbfae8a3b27c72d75e90d38c79b':
  Docs: Final CL for NDK-docs-onto-DAC, pulling all files into a single CL.