tree 2403bfa55e1cbc6ed1e7c495afcba1d865772bdc
parent 2ecbe727ff0399680a4ea83ce2731e5be43e3912
parent 5f2563c05dc0f265e502bcea60e0f122c9695342
author Michael Wright <michaelwr@google.com> 1463506082 +0000
committer android-build-merger <android-build-merger@google.com> 1463506082 +0000

Merge "Fix strstr16." into nyc-dev
am: a34a383607

* commit 'a34a383607007d632878929c6c9278221242d457':
  Fix strstr16.

Change-Id: I8fa1fab977f974c861cecb8b24b72cd175c27752