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