tree 26f5d7ba64c7912a90952921b9be5b885159147a
parent abc68413b50553aad21b14220c2cc79d13838aa6
parent 9373a724d34419cc398c36c8a3ab7258b57bcdb0
author Amith Yamasani <yamasani@google.com> 1292024381 -0800
committer Android (Google) Code Review <android-gerrit@google.com> 1292024381 -0800

Merge "Potential fix for Settings screen ClassCast exception on the phone."