tree f167876fb46d50eec953f9fc658ed2fd218e28df
parent b0a4ac136da6a6bc6185c19373eecc848b673aaa
parent 06a1ff7467bee1d9587c604c59ac5d53b42617f7
author Sunny Goyal <sunnygoyal@google.com> 1422669747 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1422669747 +0000

am 06a1ff74: am 2fce90c3: Cleaning up icon resizing code

* commit '06a1ff7467bee1d9587c604c59ac5d53b42617f7':
  Cleaning up icon resizing code