Merge commit 'a27353c1965911f69be8d02a01b15389189eab9d' into gingerbread-plus-aosp * commit 'a27353c1965911f69be8d02a01b15389189eab9d': Cat: Generalize stk into cat
Merge commit 'a27353c1965911f69be8d02a01b15389189eab9d' into gingerbread-plus-aosp * commit 'a27353c1965911f69be8d02a01b15389189eab9d': Cat: Generalize stk into cat