tree 6b03563713d192a4c771cb699fda5403609ceb17
parent df77450a1b93916cf41602fa396c539dbf73a067
parent 5df21f975455be6e31a7868ed871f414496e9358
author Mark Salyzyn <salyzyn@google.com> 1453918109 +0000
committer android-build-merger <android-build-merger@google.com> 1453918109 +0000

Merge changes I4ebccfd0,I3507bdfd,Iaf02f55c am: acca0abaf1
am: f6ec7d5e3a

* commit 'f6ec7d5e3a55ee7eca4203dc386b6d0837b8e660':
  Parcel: file descriptor leak
  Parcel: include Android coding standard
  Parcel: LOG_TAG cleanup