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

Change-Id: I45f017a4bf82ff1af508994bc37cc7c457785be2


Trivial merge