tree 9f324d9bf95e20bda6cff80465062c5d5c9c6491
parent a0a1599d8b8d8da38a47a939864d6f80bf6b9a09
parent d6ad64f89439b61eb1af2e5d8ca957c3887d9e56
author Alain Vongsouvanh <alainv@google.com> 1454102302 +0000
committer android-build-merger <android-build-merger@google.com> 1454102302 +0000

Merge changes I68ed9d1c,I4ebccfd0,I3507bdfd,Iaf02f55c into cw-e-dev
am: d6ad64f894

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