tree d10bfb60daa26a6b22f817a5ef86143cd56fd142
parent 4c4b1d65ff65ec2a6b45047ff24284989dbeb8b7
parent c6ef5428cf3ced10645f5bab7bc3b99ba5ec191a
author Deepanshu Gupta <deepanshu@google.com> 1396581585 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1396581585 +0000

am c6ef5428: (-s ours) am a5346647: am 14dee803: 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 'c6ef5428cf3ced10645f5bab7bc3b99ba5ec191a':
  Fix text size in Fake Action Bar. [DO NOT MERGE]