tree deece2bdc0b82c838359aeea3dfe3fd6b3d17f85
parent 991c988dacecf84005e03ece8ac0e31247dc262a
parent 9ac73b3569a334ded9a794396d044b4db5f7d1ae
author Jake Hamby <jhamby@google.com> 1357930389 -0800
committer Android Git Automerger <android-git-automerger@android.com> 1357930389 -0800

am 9ac73b35: am 9e00abc6: Merge "CB: Turn on CMAS Presidential"

* commit '9ac73b3569a334ded9a794396d044b4db5f7d1ae':
  CB: Turn on CMAS Presidential