Merge "Add preliminary support for NDK r10c" into lmp-dev
authorPyry Haulos <phaulos@google.com>
Thu, 2 Oct 2014 15:53:19 +0000 (15:53 +0000)
committerAndroid (Google) Code Review <android-gerrit@google.com>
Thu, 2 Oct 2014 15:53:19 +0000 (15:53 +0000)

Trivial merge