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

Change-Id: I6569f8641fe6100c2fbc55f5d1acc16656a96714


Trivial merge