tree 952577ee2aff510cc1daf148929f8803313824eb
parent 8ea513e9946c461001d18d6999da77f8f40313a6
parent 6ca2841444fa47edede00296d09f21dde6de2f39
author Chris Banes <chrisbanes@google.com> 1433960134 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1433960134 +0000

am 6ca28414: Merge "Make TabLayout more customizable" into lmp-mr1-ub-dev

* commit '6ca2841444fa47edede00296d09f21dde6de2f39':
  Make TabLayout more customizable