tree d777c86ac5fdf85c3f0e34451515e19d528043d7
parent e74d514cfef4fec5aa06e0af766f53ea2c7383b6
parent 1ed747a4c07101793322c13a36dd547df4a3aa50
author Winson Chung <winsonc@google.com> 1304555103 -0700
committer Android (Google) Code Review <android-gerrit@google.com> 1304555103 -0700

Merge "Testing mixing shortcuts into widgets pane."