tree d7c93cf944dcf502b7904b35f642bca7bd0c6f33
parent 4ee35806090a5e01600c87ff12ecd041ad4586f8
parent fce708d285506f65eb51a3256b2a04111e4054cc
author Jeff Sharkey <jsharkey@android.com> 1400692519 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1400692519 +0000

am fce708d2: am 9ef2117f: am bc06158a: Merge "Check for null in LocalSocketImpl.SocketInputStream.available()"

* commit 'fce708d285506f65eb51a3256b2a04111e4054cc':
  Check for null in LocalSocketImpl.SocketInputStream.available()