tree cd45bb89cb28001b809c4d3b2547e75af3c51b6e
parent 629c7cc84d4880611718ab1812b9b9d1bf7ee6a0
parent afb1fccfbb8d3ba779b99bf21372276b62faf267
author smain@google.com <smain@google.com> 1413418038 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1413418038 +0000

am afb1fccf: am e87bd05e: am 820e226d: am d1ab4cb3: am 05e55e90: Merge "add butterbar for L announcement. make the butterbar an encapsulated method for inclusion multiple places." into klp-modular-docs

* commit 'afb1fccfbb8d3ba779b99bf21372276b62faf267':
  add butterbar for L announcement. make the butterbar an encapsulated method for inclusion multiple places.