smain@google.com 093283a070 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 '820e226d5dc63589dec0263d3639526addb5dbaa': add butterbar for L announcement. make the butterbar an encapsulated method for inclusion multiple places.		2014-10-15 19:17:43 +00:00
core	Merge "resolved conflicts for merge of 852fc3e6 to lmp-dev-plus-aosp" into lmp-dev-plus-aosp	2014-10-15 00:19:06 +00:00
libs/host	Support host multilib build	2014-05-14 16:55:04 -07:00
target	am 4543ae81: Merge "Add Cutive Mono to makefiles" into lmp-dev	2014-10-10 23:46:06 +00:00
tools	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	2014-10-15 19:17:43 +00:00
.gitignore	Delete .swp file added by accident.	2014-07-22 17:42:35 -07:00
CleanSpec.mk	am e105b8f2: Merge "And then L, without ever becoming a real code name, transforms like magic to 5.0." into lmp-dev	2014-09-25 00:40:56 +00:00
buildspec.mk.default	Remove WEBCORE_INSTRUMENTATION and ENABLE_SVG	2013-07-25 15:52:17 -07:00
envsetup.sh	Call art-on only when debugging ART processes.	2014-10-05 10:41:41 -07:00