tree 937360898f533277328037c714e129a111149bf6
parent 300c1504488a35372cec8c431e4d833df886ec8e
parent 0c4a64451eb868d1f6abda45896dc2d2c4a9f2de
author Sunny Goyal <sunnygoyal@google.com> 1406062795 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 1406046079 +0000

Merge "Merging motorola's patch to fix ClassCastException" into ub-now-master