tree c12681ef1b04abfdcb97701e5abb02b401bd9d12
parent 10790a466981b50690e6f03fb9f7c4ef6a7a5eb9
parent dc2ee1bfb50b7bec0cf3215e3d298b246dc71101
author Michael Kolb <kolby@google.com> 1297898387 -0800
committer Android (Google) Code Review <android-gerrit@google.com> 1297898387 -0800

Merge "fix shortcut handling"