tree e3b636b85662a07b90ce6ae7b78f489851804ad7
parent 8e5bee9cac6f30d8097085d427cdec911aeb3ac7
parent ac14a13981085920bc538cdcb83aefd5afef2d2f
author Mark Salyzyn <salyzyn@google.com> 1453921830 +0000
committer android-build-merger <android-build-merger@google.com> 1453921830 +0000

Merge "system_server BINDER_TYPE_FD sockets using ashmem accessors" am: cf9944684f
am: becad77245

* commit 'becad77245e5549600e996b287ad47e8c0edcd46':
  system_server BINDER_TYPE_FD sockets using ashmem accessors