From: Jean-Baptiste Queru <jbq@google.com>
Date: Wed, 15 Sep 2010 21:25:00 +0000 (-0700)
Subject: Manual merge into master
X-Git-Tag: android-x86-4.4-r1~2168
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=868391e565a90d18f59b528ba125239ca4112825;p=android-x86%2Fbuild.git

Manual merge into master

Change-Id: Ib71bf36e1205e0bbf1f375cee4a28bceaba60c97
---

868391e565a90d18f59b528ba125239ca4112825
diff --cc core/user_tags.mk
index 26f60d7f6,3c7fa02c9..46ac11713
--- a/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 \