OSDN Git Service

resolve merge conflicts of d676080a37 to lmp-mr1-ub-dev.
authorChristopher Ferris <cferris@google.com>
Thu, 22 Oct 2015 22:27:54 +0000 (22:27 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Thu, 22 Oct 2015 22:27:54 +0000 (22:27 +0000)
commit216bff9ff33d74fb7f232045799a93b102a4d2a2
tree02cf208ebc4f70f8134235d155b5bf9bb640a08a
parent1a61896b1bc470f9377eeeafec461aba0d0dda6c
parentafff4442ae092469f298a71862d61c65ceb67b03
resolve merge conflicts of d676080a37 to lmp-mr1-ub-dev.
am: afff4442ae

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