tree 236bbe1c4e94d78026186eced17f485024bcffa9
parent ae8e9cd6dac9f11745ec139a39c4dd9288f4719e
parent 0274a22bd9c8fd6037c6a251174dd92ddeada016
author Nancy Chen <nancychen@google.com> 1416253682 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1416253682 +0000

am 0274a22b: Merge "Add a color for settings button." into lmp-mr1-dev

* commit '0274a22bd9c8fd6037c6a251174dd92ddeada016':
  Add a color for settings button.