tree cba334022ef5292c715597cdbdfb6059a5cf2548
parent 31920daec9d919c83f88e12002914fcef48882da
parent d80dc80dbf15f0329a085b21e6e6e4c993e68505
author Michael Jurka <mikejurka@google.com> 1368008759 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1368008759 -0700

am d80dc80d: Merge "Get rid of duplicate backgrounds" into jb-mr2-dev

* commit 'd80dc80dbf15f0329a085b21e6e6e4c993e68505':
  Get rid of duplicate backgrounds