tree c6daf7f5a6f2beb3e28265632b74f7cd5982bb67
parent 37e5110577b42d5e85175608ecff2bddf596dacc
parent fb604203d2b14d6a757810397b7c6897136fb2be
author smain@google.com <smain@google.com> 1413677620 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1413677620 +0000

am fb604203: am f3e585ab: Merge "add glare effect to screenshot and add 1x version with srcset" into lmp-dev

* commit 'fb604203d2b14d6a757810397b7c6897136fb2be':
  add glare effect to screenshot and add 1x version with srcset