OSDN Git Service

am b4ccca65: resolved conflicts for 2181f1a4 to stage-aosp-master
authorScott James Remnant <keybuk@google.com>
Mon, 19 Oct 2015 23:45:11 +0000 (23:45 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Mon, 19 Oct 2015 23:45:11 +0000 (23:45 +0000)
commit3f2e8950f6d38f6088f8ae99916ff506bf6108df
tree2dedf0ed6acb03ff309eadca1a670c01f26ce338
parent31b66eb382955de346428b5fef43b06f77131fce
parent93d4e860bee9059630cee1cc9355544cf4ebad65
am b4ccca65: resolved conflicts for 2181f1a4 to stage-aosp-master
am: 93d4e860be

* commit '93d4e860bee9059630cee1cc9355544cf4ebad65':
  Fix PAN crash due to fd mismatch