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

Change-Id: Iab81c26287e321d1ae9d15873866617690977868


Trivial merge