tree e3b636b85662a07b90ce6ae7b78f489851804ad7
parent f7ca3d492ce09c4aac8c8af2336eb843ca5083b6
parent 6359f8dc1049030683d9a43483f2016ce7f9d112
author Alain Vongsouvanh <alainv@google.com> 1454102850 +0000
committer android-build-merger <android-build-merger@google.com> 1454102850 +0000

Merge changes I68ed9d1c,I4ebccfd0,I3507bdfd,Iaf02f55c into cw-e-dev am: d6ad64f894 am: a20eb797c4 am: 7452d20732
am: eb868b3717

* commit 'eb868b3717f391951258b6b249862f02d83e2ea1':
  system_server BINDER_TYPE_FD sockets using ashmem accessors
  Parcel: file descriptor leak
  Parcel: include Android coding standard
  Parcel: LOG_TAG cleanup