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

* commit 'f653040adb93cafdd8f9cd4fdfa5f69ed0b1f77d':
  Correctly resolve textSize attribute in ViewPagerTabs
tree: 734344c6ef89ed07bd0bcd3371fac92cb0bd51db
  1. res/
  2. src/
  3. tests/
  4. Android.mk
  5. AndroidManifest.xml
  6. proguard.flags