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)
* commit 'b4ccca65781e92ef9096834db8537309917b9cea':
  Fix PAN crash due to fd mismatch


Trivial merge