Brian Carlstrom 712676772b resolved conflicts for merge of 5ec66d15 to jb-mr2-dev-plus-aosp ... Change-Id: I0ef1665600f78527d0a98c7b36c4c2ef1a8182e3		2013-04-03 14:19:26 -07:00
..
apicheck.mk	apicheck: Suppress certain changes in final qualifier.	2013-04-01 14:24:49 -07:00
collect_gpl_sources.mk	Collect the GPL source files.	2011-12-12 12:57:38 -08:00
cts.mk	Add OkHttp to the platform.	2013-04-02 16:24:04 -07:00
factory_bundle.mk	Do not disable factory build under PDK	2013-03-28 14:38:11 -07:00
factory_ramdisk.mk	Do not disable factory build under PDK	2013-03-28 14:38:11 -07:00
ide.mk	Make make ECLIPSE-lunch build a .classpath for all the java stuff that will be included in the	2010-05-26 17:58:21 -04:00
product-graph.mk	More product debugging.	2012-08-16 22:36:41 -07:00
sdk-addon.mk	Google Add-On API Documentation Fixes (5429077)	2011-11-23 18:08:51 -08:00
vendor_module_check.mk	Store vendor module owner info on the build server.	2012-10-03 17:52:51 -07:00