No description

Ying Wang 8755756f26 resolved conflicts for merge of 3907c03e to lmp-dev-plus-aosp ... Change-Id: I580ab0693609ff506da7346548a45322000114d1		2014-10-09 19:29:53 -07:00
core	resolved conflicts for merge of 3907c03e to lmp-dev-plus-aosp	2014-10-09 19:29:53 -07:00
libs/host	Support host multilib build	2014-05-14 16:55:04 -07:00
target	am 811e650b: Merge "Add appops command to devices" into lmp-dev	2014-10-08 22:48:46 +00:00
tools	am 96a81b18: am fb68db08: Merge "Docs: Making source.android.com headers match those of developer.android.com"	2014-10-09 17:42:47 +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	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
envsetup.sh	Call art-on only when debugging ART processes.	2014-10-05 10:41:41 -07:00