commit 37773821f150778c48ef3519407d8ee71dd66a30
author Steve Moyer <smoyer@google.com> Fri Feb 07 11:46:08 2014 -0800
committer Qiwen Zhao <zhao@google.com> Wed Jun 04 09:41:24 2014 -0700
tree 82ef8bc9d7203c0fd20b28e26b39cc22e11837f2
parent 008dc16cb06976620c0fa1e51942f2d1c6af54f3

DO NOT MERGE: Combine emulator test projects into a single apk

SmsTest, GpsLocationTest, ConnectivityTest -> EmulatorSmokeTests

Conflicts:
	target/product/sdk.mk

Change-Id: Ia5add1bc6360c27f84aab8f32b30c312435b1871

target/product/sdk.mk

diff --git a/target/product/sdk.mk b/target/product/sdk.mk
index 04157e8..2962fd2 100644
--- a/target/product/sdk.mk
+++ b/target/product/sdk.mk
@@ -65,6 +65,7 @@
 	Dialer
 
 
+
 # Define the host tools and libs that are parts of the SDK.
 -include sdk/build/product_sdk.mk
 -include development/build/product_sdk.mk