tree 438eea34eba090b77fb682b76f8e5276578962d2
parent bc667f1cd7d852909a9a3893473f29dc7b000b2f
parent 05e55e9009435072ac25d2ce487d47b6c4f8a60b
author smain@google.com <smain@google.com> 1413339331 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1413339331 +0000

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

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