tree 5247d98e099a570248479b96467b4ceea1c67b85
parent 025acebee92750659478c46c67e0e5fe8e53cad4
parent 557280c116db54ed2100eb0815e6d539d2b58252
author Sunny Goyal <sunnygoyal@google.com> 1428622800 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1428622800 +0000

am 557280c1: Merge "Updating folder UI" into ub-launcher3-burnaby

* commit '557280c116db54ed2100eb0815e6d539d2b58252':
  Updating folder UI