tree 47aba483144b486cc7d425583b7d0d68b050ec5c
parent bb1e76bee9fa793f25f624e90ef9854146211f86
parent 4575d2014c204d68e7afe493675e8600447d0d0e
author Winson Chung <winsonc@google.com> 1322096640 -0800
committer Android Git Automerger <android-git-automerger@android.com> 1322096640 -0800

am 4575d201: am 8171d8ce: Merge "Fixing issue where shortcut holographic outlines were different than widgets. (Bug 5659891)" into ics-mr1

* commit '4575d2014c204d68e7afe493675e8600447d0d0e':
  Fixing issue where shortcut holographic outlines were different than widgets. (Bug 5659891)