tree e94bc2ece393bab029112f31bd1030b332f7b1cb
parent f98709dfa3280172c7f480beac186aec34480380
parent a7bf7c2c4afc80f55aa339d547118086aeedbeec
author Jake Hamby <jhamby@google.com> 1350330445 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1350330445 -0700

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

* commit 'a7bf7c2c4afc80f55aa339d547118086aeedbeec':
  Multiple fixes to CMAS app.