tree 4b706ffc11dca44943f7c029ae3b696128b16237
parent 5df21f975455be6e31a7868ed871f414496e9358
parent 453376daef43bb50d8be63d6bc418d6888e19090
author Mark Salyzyn <salyzyn@google.com> 1453921717 +0000
committer android-build-merger <android-build-merger@google.com> 1453921717 +0000

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

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