tree 5d8739fc23fa05bc3a67a78ba8863203b428700b
parent f40c1fe5ae6afb9ce1fb179c3b0686d22ca98469
parent ece6238488207bd20cc4d32fda90514ebf461206
author Narayan Kamath <narayan@google.com> 1402654949 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1402654949 +0000

am ece62384: Merge "Remove Parcel::writeIntPtr."

* commit 'ece6238488207bd20cc4d32fda90514ebf461206':
  Remove Parcel::writeIntPtr.