tree ec95192d2edb69e4ec0e40832569b769428cd1c2
parent ac684443a1f23a67fd23a86a3635533f0c655319
parent 49a0fd250faf00f1ce3f95ebde5ea31d87c78eec
author Scott Main <smain@google.com> 1474584681 +0000
committer android-build-merger <android-build-merger@google.com> 1474584681 +0000

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

Change-Id: I090d973fc9c4cfeb10eca5f475095ccbfcd49ef3