Merge "Fix deStrnlen fall-back implementation" into nougat-cts-dev
authorTina Zhou <tinazh@google.com>
Wed, 19 Oct 2016 16:02:52 +0000 (16:02 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Wed, 19 Oct 2016 16:02:52 +0000 (16:02 +0000)
am: a04db6628e

Change-Id: I4b9714e9f3ba652f3189eff0c3b6b03ca7ac6bb3


Trivial merge