tree 52832e8461651d236adc1a696aba62b1d38437fb
parent 1ea392f0bc30134a800be224d8fbcf1af63bb80b
parent 1b247d9f37cd1e9ca9e8c690c137858b66314b79
author Winson Chung <winsonc@google.com> 1441046821 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1441046821 +0000

am 1b247d9f: Merge "Adding workaround for regression caused by ag/752175" into ub-launcher3-burnaby

* commit '1b247d9f37cd1e9ca9e8c690c137858b66314b79':
  Adding workaround for regression caused by ag/752175