am 99939cce: (-s ours) am 6094daa2: am ba0ce056: Merge "Fix text size in Fake Action Bar. [DO NOT MERGE]" into jb-mr2-dev

* commit '99939cce702b6b5a01be351f1a0b406a16509103':
  Fix text size in Fake Action Bar. [DO NOT MERGE]