tree 02cf208ebc4f70f8134235d155b5bf9bb640a08a
parent 1a61896b1bc470f9377eeeafec461aba0d0dda6c
parent afff4442ae092469f298a71862d61c65ceb67b03
author Christopher Ferris <cferris@google.com> 1445552874 +0000
committer android-build-merger <android-build-merger@google.com> 1445552874 +0000

resolve merge conflicts of d676080a37 to lmp-mr1-ub-dev.
am: afff4442ae

* commit 'afff4442ae092469f298a71862d61c65ceb67b03':
  Sync with upstream NetBSD lib/libc/regex.