tree 1d68796acd5934782788cf2916cbcf584d7dd3dc
parent 7bff792a54ddbfa989a33e3744d1378e89de2601
parent c2c2b63ad9d47b02a6c11b7af7d5fcd6e8411e62
author Jay Shrauner <shrauner@google.com> 1393888498 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1393888498 +0000

am c2c2b63a: am a84d34e8: am 32ddc833: Merge "Protect against class cast exception" into klp-dev

* commit 'c2c2b63ad9d47b02a6c11b7af7d5fcd6e8411e62':
  Protect against class cast exception