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

Change-Id: I4da1171a9a08714971f20acd05ece96613b1cbbc


Trivial merge