OSDN Git Service

am 87b6906f: Merge "Pull in upstream fixes to reject invalid bases."
authorElliott Hughes <enh@google.com>
Tue, 23 Sep 2014 22:12:57 +0000 (22:12 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Tue, 23 Sep 2014 22:12:57 +0000 (22:12 +0000)
commit0d44da9eb4314f17df9ee2959dda50841b6c626c
tree19ba8a01cccfab7addf374b2ed39afb44bbd71f9
parent3a86c0fd900d8dfdf6f0767cd703ad21aa65eeec
parent87b6906f6e0c17b2541535be8e054324cc2fef4a
am 87b6906f: Merge "Pull in upstream fixes to reject invalid bases."

* commit '87b6906f6e0c17b2541535be8e054324cc2fef4a':
  Pull in upstream fixes to reject invalid bases.