tree 1360583ebd1d6871a3eccd8fe2f4c5de0dfae90c
parent 7672ccb3d7ae6153c86bdd69a48db7e87e445c27
parent ccc15faf56ad46f973800cb6bd41b4634b9192a0
author Dirk Dougherty <ddougherty@google.com> 1373330038 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1373330038 -0700

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

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