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

Change-Id: Id1cb19cda66bb481e4cc221e66b972c5b03d75c4


Trivial merge