OSDN Git Service

Merge "system_server BINDER_TYPE_FD driver ashmem accessors" am: b23a388c64
authorMark Salyzyn <salyzyn@google.com>
Fri, 5 Feb 2016 18:12:01 +0000 (18:12 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Fri, 5 Feb 2016 18:12:01 +0000 (18:12 +0000)
commit6ff4920cb12fa4776d27b54e2e4daa27bb78fc10
tree5f9a73f21c552838b705e41b254520a4832e4220
parent4b41905563dc35190d60e92c2ea51d210e600caa
parent3196c839af9ea74c59f5860c0d1f6e7e20b7a65e
Merge "system_server BINDER_TYPE_FD driver ashmem accessors" am: b23a388c64
am: 3196c839af

* commit '3196c839af9ea74c59f5860c0d1f6e7e20b7a65e':
  system_server BINDER_TYPE_FD driver ashmem accessors
libs/binder/Parcel.cpp