| commit | 40dabdbe77d0deb55c95dd8869d58adae488da5e | [log] [tgz] |
|---|---|---|
| author | smain@google.com <smain@google.com> | Tue Nov 04 07:33:54 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Tue Nov 04 07:33:54 2014 +0000 |
| tree | 930a43380e9e1c6697d72a91fd99479477a48c33 | |
| parent | 81ef3e771414bdf11d3641db1ceef97e310876fb [diff] | |
| parent | 782ba68dfb2ebdcc5ba0a81ecf659495c38cf45d [diff] |
am 782ba68d: am abcb1552: 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 '782ba68dfb2ebdcc5ba0a81ecf659495c38cf45d':