tree b142c96e6ec11387d96edac793fc5c7a678aced7
parent 609f99ee677b39f014e9dcbf462d75ad519bcf47
parent 26a16c24d72194c7a85b66cb4f90756ec4fb4597
author Michael Jurka <mikejurka@google.com> 1348473039 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1348473039 -0700

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

* commit '26a16c24d72194c7a85b66cb4f90756ec4fb4597':
  Try to fix RTE when updating shortcuts