OSDN Git Service

am b4ccca65: resolved conflicts for 2181f1a4 to stage-aosp-master
authorScott James Remnant <keybuk@google.com>
Mon, 19 Oct 2015 19:56:32 +0000 (19:56 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Mon, 19 Oct 2015 19:56:32 +0000 (19:56 +0000)
commit93d4e860bee9059630cee1cc9355544cf4ebad65
tree527c8578610a3e62e17a44ba70faac7b5a34c760
parent0b681505a19677ef9b66acd3d56f99716ddaaeb0
parentb4ccca65781e92ef9096834db8537309917b9cea
am b4ccca65: resolved conflicts for 2181f1a4 to stage-aosp-master

* commit 'b4ccca65781e92ef9096834db8537309917b9cea':
  Fix PAN crash due to fd mismatch