tree b9db9528ea42561d205f5dbcd6e61f0b042f959d
parent e8fbea342f07e6be236de58efaa11da3ea4b5009
parent 56745f6c7b460f16acdaaed33c67bf27b15d1698
author Dan Albert <danalbert@google.com> 1470934792 +0000
committer android-build-merger <android-build-merger@google.com> 1470934792 +0000

Merge "Add support for NDK r13." am: 287093a98c am: ae49ab2f0f
am: 56745f6c7b

Change-Id: If8145c8aa89545aa4668afc7f1e4d8577b36b6d5