tree 15b4929f812dc203644049f1d6a5392e10773f92
parent 2bcdbf8201c7bfe233aa2ee80398003767971e6a
parent 8171d8ce48765cbc9e6ed96ac3dc173a8969616d
author Winson Chung <winsonc@google.com> 1322096542 -0800
committer Android Git Automerger <android-git-automerger@android.com> 1322096542 -0800

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

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