tree 967f2714b7c695a2c8690d8099672ae2c639bbb8
parent 0436894be4c4337a4a60a3ae969428c7a09e0a6b
parent e534b8ce27e44bfbb5f737737291c0167298e426
author Yorke Lee <yorkelee@google.com> 1400025277 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1400025277 +0000

am e534b8ce: am f653040a: Merge "Correctly resolve textSize attribute in ViewPagerTabs"

* commit 'e534b8ce27e44bfbb5f737737291c0167298e426':