tree 5f12419d94f85553f90d8ec9ab076d6cb3600e09
parent 7e8ddd0c130033818a65ef4852a8204f4355adb4
parent 244637b59c328b918c6b2e1aef33ba448728207d
author Chris Wren <cwren@android.com> 1400018382 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1400018382 +0000

am 244637b5: Merge "work around bug in LauncherAppsCompat to find restored icons" into ub-now-nova

* commit '244637b59c328b918c6b2e1aef33ba448728207d':
  work around bug in LauncherAppsCompat to find restored icons