tree fa3ef4506b2bd56d92397586dafa51a0d327f6f0
parent 17f4b8b9f06562892cf76008f5bd58457f9b93d3
parent ecd365293fedf8b78cf1e8df0b9d93968c9910ba
author Sunny Goyal <sunnygoyal@google.com> 1455820409 +0000
committer android-build-merger <android-build-merger@google.com> 1455820409 +0000

resolve merge conflicts of 2953833bcb to ub-launcher3-calgary
am: ecd365293f

* commit 'ecd365293fedf8b78cf1e8df0b9d93968c9910ba':
  Adding a utility method to iterate over folder contents