OSDN Git Service

am 22b38a19: (-s ours) Ensure that deletion hook is only run on valid parents. DO...
authorTor Norbye <tnorbye@google.com>
Mon, 3 Oct 2011 23:30:29 +0000 (16:30 -0700)
committerAndroid Git Automerger <android-git-automerger@android.com>
Mon, 3 Oct 2011 23:30:29 +0000 (16:30 -0700)
* commit '22b38a190fa658924a665989d99dc508d3e88739':
  Ensure that deletion hook is only run on valid parents. DO NOT MERGE.


Trivial merge