tree 5f57f25f0b7ce57e7e35b35016d390bc2377f4f7
parent abf4e14132c43fdf176e9b66a9e403efc3767df2
author Adam Powell <adamp@google.com> 1358362321 -0800
committer Adam Powell <adamp@google.com> 1359062165 -0800

Manually cherry-pick patch skipped by automerger

am 0bb301ec: Remove cruft from ViewPager

* commit '0bb301ec35dcaf2ea9c2010790d7eadb1918b8cb':
  Remove cruft from ViewPager

Conflicts:
	v4/java/android/support/v4/view/ViewPager.java

Change-Id: Iaa705fa1eb8dea55a4161dc52b1a6633f6d1c13d