tree 02cb53dc4c1fffec1f906963438e8e285f4a136e
parent 75cdfa9ff4e82b2112a948d1c8060c899fd5a462
parent 71379b76984508cb7f498cdb9350bba0c18b0340
author Alain Vongsouvanh <alainv@google.com> 1454102517 +0000
committer android-build-merger <android-build-merger@google.com> 1454102517 +0000

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

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