tree 1d075444b97eb140e941fc6862f95cda7be12f5e
parent 8c6e6e7372f26e87b56debc1177debfa4971c00b
parent 6094daa2626e57c6bd24409f0934090581541e49
author Deepanshu Gupta <deepanshu@google.com> 1396576902 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1396576902 +0000

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

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