tree 915a1df70197f122c5fcfce34097dd39490ed401
parent 72b2f536908f0f3249c59c630f1a06af371b2bfa
parent a53466479c0bfc29c9c05d245ae1870ff3baf09b
author Deepanshu Gupta <deepanshu@google.com> 1396578387 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1396578387 +0000

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 'a53466479c0bfc29c9c05d245ae1870ff3baf09b':
  Fix text size in Fake Action Bar. [DO NOT MERGE]