OSDN Git Service

am 45baf0f3: (-s ours) am 147a50d0: Merge "Prevent user-defined basename_r from break...
authorElliott Hughes <enh@google.com>
Thu, 27 Aug 2015 05:03:15 +0000 (05:03 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Thu, 27 Aug 2015 05:03:15 +0000 (05:03 +0000)
commit44cb343e4d955105987b1e88793b314aaf029a19
tree7a1e22fd1692389e4cb7283c8a5d1dc1e40d3ee0
parent44808d163f2b926bd766d60b724e998e505e79b6
parent45baf0f384e6e2cbaa5383765a8671a00c85ea55
am 45baf0f3: (-s ours) am 147a50d0: Merge "Prevent user-defined basename_r from breaking basename(3)."

* commit '45baf0f384e6e2cbaa5383765a8671a00c85ea55':