| commit | abcb155250040cfac06ec86ba72cfca1b594c12d | [log] [tgz] |
|---|---|---|
| author | smain@google.com <smain@google.com> | Tue Nov 04 07:22:49 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Tue Nov 04 07:22:49 2014 +0000 |
| tree | 679e945f9b57a755058b9f1363d9a248913eca6e | |
| parent | fc175efc5cbe2ffebab0b5a4cfada76eaa1b581c [diff] | |
| parent | 04a4f1d031914302f9dc9244807e84fe640d3ebc [diff] |
am 04a4f1d0: am 05e55e90: Merge "add butterbar for L announcement. make the butterbar an encapsulated method for inclusion multiple places." into klp-modular-docs automerge: d1ab4cb automerge: dd5adb3 * commit '04a4f1d031914302f9dc9244807e84fe640d3ebc':