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

* commit 'e534b8ce27e44bfbb5f737737291c0167298e426':
tree: 967f2714b7c695a2c8690d8099672ae2c639bbb8
  1. res/
  2. src/
  3. tests/
  4. Android.mk
  5. AndroidManifest.xml
  6. proguard.flags