tree e85f41c8ce649fd6070037f323d36f81235fc626
parent 0fc3be50d695bac01c01385439bfaf589edceace
parent 0c13a34fd1f32a8cb8c5cec06553e3741731c756
author Sunny Goyal <sunnygoyal@google.com> 1436983392 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1436983392 +0000

am 0c13a34f: Merge "Using highres icons for backup" into ub-launcher3-burnaby

* commit '0c13a34fd1f32a8cb8c5cec06553e3741731c756':
  Using highres icons for backup