OSDN Git Service

am 18442e02: (-s ours) am beb6e08a: Sync with upstream NetBSD lib/libc/regex.
authorElliott Hughes <enh@google.com>
Mon, 19 Oct 2015 17:07:34 +0000 (10:07 -0700)
committerAndroid Git Automerger <android-git-automerger@android.com>
Mon, 19 Oct 2015 17:07:34 +0000 (10:07 -0700)
* commit '18442e023536c5cf205b820ed5d74b972b710acb':
  Sync with upstream NetBSD lib/libc/regex.


Trivial merge