Merge "Fix deStrnlen fall-back implementation" into nougat-cts-dev am: a04db6628e...
authorTina Zhou <tinazh@google.com>
Tue, 4 Apr 2017 18:51:37 +0000 (18:51 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Tue, 4 Apr 2017 18:51:37 +0000 (18:51 +0000)
am: 4a8439bd62

Change-Id: Ica84e895142e68fdd89d578a588318948d495ba6


Trivial merge