tree 3c33a58425b68749714b711ef240fa05104b5a17
parent 809c1a68128f6ad97951be6525205488fc4f1d4e
parent 45b87713e7b0a50ffa369a6e0674580281e37d38
author Neil Fuller <nfuller@google.com> 1440458586 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1440458586 +0000

am 45b87713: am 3e8abdd9: am 57601a42: am d387c0ad: Merge "Fixes and improvements for SerializationTest" into lollipop-cts-dev automerge: 660504a

* commit '45b87713e7b0a50ffa369a6e0674580281e37d38':
  Fixes and improvements for SerializationTest