tree 3eed8d8fe359db9c5d85a8d3c9f12e368476360a
parent 214ed2e04aa27036aa1e8cec83fea44ea4ed905c
parent 0b0d9d40ee055e166235e0e68141a3c06f8d0e94
author Sunny Goyal <sunnygoyal@google.com> 1425530146 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1425530146 +0000

am 0b0d9d40: Merge "Refactoring folder content" into ub-launcher3-burnaby

* commit '0b0d9d40ee055e166235e0e68141a3c06f8d0e94':
  Refactoring folder content