tree dedf9f2dcd1ee1c06c686402029863b04492d569
parent aa3fd71a1f2bd84acef84e65963ba9af02d75a3b
parent 7a3235c598fa46fbc540746648f129f6ef8dc647
author Sunny Goyal <sunnygoyal@google.com> 1435600373 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1435600373 +0000

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 '7a3235c598fa46fbc540746648f129f6ef8dc647':
  [DO NOT MERGE] Removing junit.framework.Assert from wallpaper picker code