Merge "Fix deStrnlen fall-back implementation" into nougat-cts-dev am: a04db6628e...
authorTina Zhou <tinazh@google.com>
Tue, 22 Aug 2017 18:36:55 +0000 (18:36 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Tue, 22 Aug 2017 18:36:55 +0000 (18:36 +0000)
am: ccb8fde217

Change-Id: If0dc13f5f66dad71be6926a44cdaa96216dde9fc


Trivial merge