tree 009f99c30cb5c3b210fc6f24f5bcbd4db4a877fe
parent c4a9233a94ef186baa8113ceb44b08c65725ed41
parent b2ae8acc0c65a5464a4782ee43e0594a15b9cc16
author Michael Jurka <mikejurka@google.com> 1348266528 -0700
committer Android (Google) Code Review <android-gerrit@google.com> 1348266528 -0700

Merge "Try to fix RTE when updating shortcuts" into jb-mr1-dev