tree af39ceb9c6cb26c3ee1ea02c1e03de9a2486ac93
parent 3675f423bfa79d5884bb06ab19565fb959285c37
parent 9a7664506828bc0e3f5be74f6bd043f629a19c91
author Jay Shrauner <shrauner@google.com> 1398862213 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1398862213 +0000

am 9a766450: (-s ours) am 43bd98e5: (-s ours) am 4889048e: am c5517b3e: Protect against class cast exception DO NOT MERGE

* commit '9a7664506828bc0e3f5be74f6bd043f629a19c91':