tree 60ecb5a0a173022524d5810e930f0d4064697b21
parent c738e4f02662055c8f7ccca0212144af29360de9
parent c767689be7ace9a282ca895e79c1a5c82f5cf5a9
author Sunny Goyal <sunnygoyal@google.com> 1435599676 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1435599676 +0000

am c767689b: (-s ours) Merge "[DO NOT MERGE] Removing junit.framework.Assert from wallpaper picker code" into ub-launcher3-almonte

* commit 'c767689be7ace9a282ca895e79c1a5c82f5cf5a9':
  [DO NOT MERGE] Removing junit.framework.Assert from wallpaper picker code