George Mount 56f7b77520 am a5841355: (-s ours) DO NOT MERGE ANYWHERE. Add data binding to built javadoc. ... * commit 'a58413554455248dcaea3ad1c022316c1e3288e7': DO NOT MERGE ANYWHERE. Add data binding to built javadoc.		2015-07-27 14:35:51 +00:00
core	Fix conflict resolving error in ef5dc90bba	2015-06-26 14:06:32 -07:00
libs/host	Remove HAVE_SYMLINKS.	2015-01-12 17:21:01 -08:00
target	am 35790525: am 3a5602eb: Merge "core_base.mk: switch to new H264 and MPEG2 software codecs"	2015-04-17 05:20:26 +00:00
tools	am aee6585c: Update js/css versions and add pt-br.	2015-07-08 11:29:45 +00:00
.gitignore	Delete .swp file added by accident.	2014-07-22 17:42:35 -07:00
CleanSpec.mk	resolved conflicts for merge of 6d607ee7 to lmp-mr1-dev-plus-aosp	2015-03-26 18:03:17 -07:00
buildspec.mk.default	Remove WEBCORE_INSTRUMENTATION and ENABLE_SVG	2013-07-25 15:52:17 -07:00
envsetup.sh	Include vendorsetup scripts in order	2015-04-03 11:58:09 +02:00