tree e85fe321060160492656e9cef2a350b7d5390812
parent ecdb6ea70758e5f343cdcaae7175286e9ed9bd8a
parent 62227274cb2c16c87beda01991c61618c800f66b
author Sunny Goyal <sunnygoyal@google.com> 1431370838 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1431370838 +0000

am 62227274: Merge "Using xml-drawable and elevation as folder background" into ub-launcher3-burnaby

* commit '62227274cb2c16c87beda01991c61618c800f66b':
  Using xml-drawable and elevation as folder background