Conflicts: docs/html/sdk/ndk/1.5_r1/index.jd Change-Id: I19f6e97bd019ac347a34db0aea157a33d0217189
Change-Id: I915efc49d0ea736e3fd408628d35f53e3a85c1df