tree 7b66010cb68e49fee7d2d9666376293a75971f31
parent f0cd7d2e44d8ec4589c2dbd06e4779e44d301110
parent 57c5388c48fe8a2f71c88e2f26a2f66e3b22c5e5
author Alan Viverette <alanv@google.com> 1410737877 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1410737877 +0000

am c6c51a1d: am 6b205498: am 1aa39ebf: Merge "Simplify progress bar paths" into lmp-dev

* commit 'c6c51a1deb0c15dcb99856603e3fd801babef361':
  Simplify progress bar paths