tree a2cd07e91fd473ac81286acee759742e9164a4ed
parent 82cc3fe6c77322d93ff74b25354e4bca77ab4a83
author Sunny Goyal <sunnygoyal@google.com> 1406057224 -0700
committer Sunny Goyal <sunnygoyal@google.com> 1406062573 -0700

Merging motorola's patch to fix ClassCastException

issue: 15518616
Change-Id: I7d707f12cb20be9aa24d7ea86051f3712b3534af