tree c028bfe537607823c37e2ffc8c713c73059d3130
parent f7fcf0a8832a8cdc1d02ab4c28c9daf7b15d96f1
parent c86584b440448f51c35416e872e1f59f132fa0bb
author Sunny Goyal <sunnygoyal@google.com> 1422685381 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1422685381 +0000

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

* commit 'c86584b440448f51c35416e872e1f59f132fa0bb':