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

Change-Id: If301d2d8f861b82163e8bb994e6a9c0f17b4856f


Trivial merge