tree f65c54675f9a14a5bc130ce54cc16c23e837b499
parent bcda1f4c86680063fcfe50a774090a7b44538341
parent 1eb22d29947de4701431ce09a5c8c07391f22659
author Mark Salyzyn <salyzyn@google.com> 1454695921 +0000
committer android-build-merger <android-build-merger@google.com> 1454695921 +0000

Merge "system_server BINDER_TYPE_FD driver ashmem accessors" am: b23a388c64
am: 3196c839af

* commit '3196c839af9ea74c59f5860c0d1f6e7e20b7a65e':
  system_server BINDER_TYPE_FD driver ashmem accessors