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

Change-Id: Ia2a63853ace7455d47b6b993d1b0727f646b67b2


Trivial merge