tree 47aba483144b486cc7d425583b7d0d68b050ec5c
parent 9c96b0173ec41ea5a9d6abb68f75d9496bcf2890
parent 043545a3c03e8d05a0fb49b1f539e77b8df0703b
author Winson Chung <winsonc@google.com> 1322096732 -0800
committer Android Git Automerger <android-git-automerger@android.com> 1322096732 -0800

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

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