Manual merge into master

author Jean-Baptiste Queru <jbq@google.com>

Wed, 15 Sep 2010 21:25:00 +0000 (14:25 -0700)

committer Jean-Baptiste Queru <jbq@google.com>

Wed, 15 Sep 2010 21:25:11 +0000 (14:25 -0700)
author Jean-Baptiste Queru <jbq@google.com>
Wed, 15 Sep 2010 21:25:00 +0000 (14:25 -0700)
committer Jean-Baptiste Queru <jbq@google.com>
Wed, 15 Sep 2010 21:25:11 +0000 (14:25 -0700)
diff --cc core/user_tags.mk

index 26f60d7,3c7fa02..46ac117
--- 1/core/user_tags.mk
--- 2/core/user_tags.mk
+++ b/core/user_tags.mk
@@@ -521,9 -449,9 +523,10 @@@ GRANDFATHERED_USER_MODULES += 
         rsg-generator \
         run-as \
         schedtest \
+ +      screenshot \
         screenshot2 \
         sdcard \
+       sdklauncher \
         sdklib \
         sdkmanager \
         sdkstats \
author	Jean-Baptiste Queru <jbq@google.com>
	Wed, 15 Sep 2010 21:25:00 +0000 (14:25 -0700)
committer	Jean-Baptiste Queru <jbq@google.com>
	Wed, 15 Sep 2010 21:25:11 +0000 (14:25 -0700)