tree 79653f9a4b50764aab7a13a59ef87c7c68a1d9ad
parent ff3ed45537f9566686efbab2a9f57333e40cf83d
parent d641bb009912818a1eb68bb46bfaf3af08318ea7
author Jason Sams <jsams@google.com> 1427410399 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1427410399 +0000

am d641bb00: am 73ffe0cc: Merge "Catch errors for unknown object types."

* commit 'd641bb009912818a1eb68bb46bfaf3af08318ea7':
  Catch errors for unknown object types.