Dan Albert eecf00db59 resolved conflicts for merge of 4c32aa3d to lmp-mr1-dev-plus-aosp ...

Change-Id: I32a06c88416e68ce628f642e0d025d1df5e227d7

2015-03-27 14:37:14 -07:00

core

am ddc5a8f7: am 8ffec13d: Merge "Add back Java resources to apk without Java code."

2015-03-27 21:09:39 +00:00

libs/host

Remove HAVE_SYMLINKS.

2015-01-12 17:21:01 -08:00

target

am 23588104: am 971e5787: Merge "Revert "Replace legacy Browser with BookmarkProvider""

2015-03-20 21:24:37 +00:00

tools

resolved conflicts for merge of 4c32aa3d to lmp-mr1-dev-plus-aosp

2015-03-27 14:37:14 -07:00

.gitignore

Delete .swp file added by accident.

2014-07-22 17:42:35 -07:00

buildspec.mk.default

Remove WEBCORE_INSTRUMENTATION and ENABLE_SVG

2013-07-25 15:52:17 -07:00

CleanSpec.mk

resolved conflicts for merge of 6d607ee7 to lmp-mr1-dev-plus-aosp

2015-03-26 18:03:17 -07:00

envsetup.sh

am 6492792d: Merge "Consult tput about color control sequence support"

2015-03-03 19:02:37 +00:00

Description

No description provided

104 MiB

Languages

Makefile 32.1%

Python 31.1%

Go 13.7%

Rust 7.7%

Java 5.2%

Other 10.1%