| commit | 2c5ef0dbf26f075da1937f3eb91ab33994d688ad | [log] [tgz] |
|---|---|---|
| author | smain@google.com <smain@google.com> | Tue Nov 04 07:37:34 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Tue Nov 04 07:37:34 2014 +0000 |
| tree | 289e6459af23ae8f6163c335abec6f19f7bc5bdd | |
| parent | 8d71c2b7e8682c0f6c7ac611dede01222f299c6b [diff] | |
| parent | 40dabdbe77d0deb55c95dd8869d58adae488da5e [diff] |
am 40dabdbe: 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 '40dabdbe77d0deb55c95dd8869d58adae488da5e':