tree b4e0675f04c26c8b4797a241595a9328e589ba24
parent fb2bb3d867fcdd3add7e30d1cbb6b956d3fce89e
parent 56811475202ededf0c76bf9b28d3e27d5761d747
author Dirk Dougherty <ddougherty@google.com> 1373329923 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1373329923 -0700

am 56811475: am 5386532e: Merge "Doc change: Move butterbar css to template assets." into jb-mr1.1-ub-dev

* commit '56811475202ededf0c76bf9b28d3e27d5761d747':
  Doc change: Move butterbar css to template assets.