tree c2175942e3a631ad112fe6ab17da560c45fc1ae2
parent 8899b616ca910a95499737a4100b258a0e6f183f
parent 80aead1607c2012c4d03313ed1a07e8363983842
author Andrew Lee <anwlee@google.com> 1400026044 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1400026044 +0000

am 80aead16: am 10b8c46f: Merge "Add list item background color."

* commit '80aead1607c2012c4d03313ed1a07e8363983842':