tree 2699c97acb445ff19a437d090c287b114daac180
parent 854d5bf75b5ea7cd658de33936ce2a54998871fb
parent 33f2e08ec34d4f4eef72754de3552b8eac290bcf
author Scott Main <smain@google.com> 1474581558 +0000
committer android-build-merger <android-build-merger@google.com> 1474581558 +0000

Merge "Removing a temporary redirect for /ndk/guides/cmake.html" into nyc-dev am: 8b05feb5b4 am: ba9db4b110
am: 33f2e08ec3

Change-Id: Ied825bc0503ff678200d9b117739c8dd5dc27ebe