tree a34b1e2fbe037ccde7b19e10b1eb798741f478eb
parent 0370de6691bf0ed835da47764b67c34d53c72910
parent bf140c36ba8fb9ee798baa17064a30f6ba7fc4f8
author Dan Albert <danalbert@google.com> 1431119247 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1431119247 +0000

am bf140c36: Merge "Revert "Update TabLayout demo to use new APIs"" into lmp-mr1-ub-dev

* commit 'bf140c36ba8fb9ee798baa17064a30f6ba7fc4f8':
  Revert "Update TabLayout demo to use new APIs"