tree cba62d0d64153aa2169651696bc238591341d679
parent be978777f2b89fd996eecc1784a61a17cb625a8a
parent 20aba04b7bc54b60da4c378679e5407c57d2d289
author Winson Chung <winsonc@google.com> 1414085231 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1414085231 +0000

am 20aba04b: am 36f7ad93: am a4c6fa59: am 7c2e2894: am ba4e52f4: Updating page indicator assets.

* commit '20aba04b7bc54b60da4c378679e5407c57d2d289':