tree a0b747cfb8a957f1d793f566f4ae89d3ed9cbfb6
parent 3bac5056c879ef8ace5afd57e35fbb138b9ba4de
parent bd403df49693fe08267a90c8abf0396dfab2c4bf
author Tyler Gunn <tgunn@google.com> 1452710837 +0000
committer android-build-merger <android-build-merger@google.com> 1452710837 +0000

Merge "Fix potential ClassCastException." into mnc-dr1.5-dev am: 0829e9228a am: 40e3e15bfd
am: bd403df496

* commit 'bd403df49693fe08267a90c8abf0396dfab2c4bf':
  Fix potential ClassCastException.