tree d7e8d355e73c3933217d0eef32077892ba96ee42
parent 49f9c8e032c4c3c4f9c79fecd53bbebe4a34a50a
parent 9353903d442fa8dc3dd93168e6f9cf0dcf999dd7
author Sunny Goyal <sunnygoyal@google.com> 1431716484 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1431716484 +0000

am 9353903d: Merge "Fixing issue with folder inflation" into ub-launcher3-burnaby

* commit '9353903d442fa8dc3dd93168e6f9cf0dcf999dd7':
  Fixing issue with folder inflation