tree 6f94675c309a12a129daf808a679634c8f2c17d4
parent 12bc49de3357d8eb734f94ee685a504014954a2d
parent bbc4455be0a57658475828c452ee8eda29aa8b51
author Yigit Boyar <yboyar@google.com> 1413991303 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1413991303 +0000

am bbc4455b: Merge "Add color picker to cardview demo" into lmp-mr1-dev

* commit 'bbc4455be0a57658475828c452ee8eda29aa8b51':
  Add color picker to cardview demo