Ying Wang 84f62c3ad3 resolved conflicts for merge of 828e92d6 to master ...

Change-Id: Idc9b059f840f328e86e3972882ccef6d5ee4e1d9

2015-03-12 14:36:29 -07:00

core

am ec447f36: am 168357ae: Merge "Support .asm being compiled by yasm targeted for x86_64."

2015-03-12 15:35:53 +00:00

libs/host

Remove HAVE_SYMLINKS.

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

target

am b396517c: am 501af528: Merge "Increase system and userdata partition sizes."

2015-03-12 15:35:51 +00:00

tools

am 0aef0966: am fafe5ac8: Merge "Signapk.java: hide the password"

2015-03-12 15:35:56 +00: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

Update version to MNC.

2015-01-22 16:36:55 -08:00

envsetup.sh

Allow variable overrides in mmm and mmma

2015-03-05 19:52:55 +01: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%