Merge branch 'master' into froyo-release

core/main.mk

@@ -689,6 +689,7 @@ $(call dist-for-goals, droid, \
 	$(INSTALLED_FILES_FILE) \
 	$(INSTALLED_BUILD_PROP_TARGET) \
 	$(BUILT_TARGET_FILES_PACKAGE) \
+	$(INSTALLED_ANDROID_INFO_TXT_TARGET) \
  )
 
 # Tests are installed in userdata.img.  If we're building the tests

tools/merge-event-log-tags.py

@@ -82,6 +82,12 @@ for fn in args:
     if t.tagname in by_tagname:
       orig = by_tagname[t.tagname]
 
+      # Allow an explicit tag number to define an implicit tag number
+      if orig.tagnum is None:
+        orig.tagnum = t.tagnum
+      elif t.tagnum is None:
+        t.tagnum = orig.tagnum
+
       if (t.tagnum == orig.tagnum and
           t.description == orig.description):
         # if the name and description are identical, issue a warning

tools/releasetools/ota_from_target_files

@@ -153,7 +153,7 @@ class Item:
       suffix = { False: "", True: "/" }
       input = "".join(["%s%s\n" % (i.name, suffix[i.dir])
                        for i in cls.ITEMS.itervalues() if i.name])
-      output2, error = p.communicate(input)
+      output, error = p.communicate(input)
       assert not error
 
     for line in output.split("\n"):