tree d5de6e4c6bfd94c7eb0a9fae613b488814081425
parent 4744fabc25867bfc02a216f7c6c000a9a8224cad
parent a665ca805c7ecda89ef95658f4d1c09ba6bd7f2e
author Jeff Brown <jeffbrown@google.com> 1284340265 -0700
committer Android (Google) Code Review <android-gerrit@google.com> 1284340265 -0700

Merge "Undo API patch due to field pulled up to superclass." into gingerbread