tree ac3ed0a42dd685770ea0046b8aa17cab9710b10a
parent d93b0b67754f6d06407086278298f44156458216
parent c7fdfe6b67d81a62d79912780b585673043148ab
author Deepanshu Gupta <deepanshu@google.com> 1396577639 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1396577639 +0000

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

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