tree 009f99c30cb5c3b210fc6f24f5bcbd4db4a877fe
parent 3501c173e4e2f167f0a7336645526ef54799a8f2
parent e5574e0b7316890bcbce2465e632a04049b57769
author Michael Jurka <mikejurka@google.com> 1348266635 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1348266635 -0700

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

* commit 'e5574e0b7316890bcbce2465e632a04049b57769':
  Try to fix RTE when updating shortcuts