tree e94bc2ece393bab029112f31bd1030b332f7b1cb
parent 0ca0defd3003de832efc85eee8a8c92ef15bae71
parent 8188f826ab8573d3c08566c61d0708f465115a78
author Jake Hamby <jhamby@google.com> 1350330350 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1350330350 -0700

am 8188f826: Merge "Multiple fixes to CMAS app." into jb-mr1-dev

* commit '8188f826ab8573d3c08566c61d0708f465115a78':
  Multiple fixes to CMAS app.