tree 7a571dd1b6f80a357f9ce47f4f5dc971487ec625
parent 49de87a1ce20e08d0fea8c6415c86854dfcbb861
parent 1f72739a0b546d8a26ec0f704fcfeaf9d051fd37
author Adrian Roos <roosa@google.com> 1437177250 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1437177250 +0000

am 1f72739a: am 57ee4b87: Merge "Fix image wallpaper size" into mnc-dev

* commit '1f72739a0b546d8a26ec0f704fcfeaf9d051fd37':
  Fix image wallpaper size