android2grd tool now puts <outputs> element first.

grit/tool/android2grd.py

 #!/usr/bin/env python
 # Copyright (c) 2012 The Chromium Authors. All rights reserved.
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
 """The 'grit android2grd' tool."""
 
 
 import getopt
 import os.path
@@ skipping 176 matching lines @@
           string.xml document.
     Returns:
       The DOM for the grd xml document produced by converting the Android DOM.
     """
 
     # Start with a basic skeleton for the .grd file.
     root = grd_reader.Parse(StringIO.StringIO(
       '''<?xml version="1.0" encoding="UTF-8"?>
          <grit base_dir="." latest_public_release="0"
              current_release="1" source_lang_id="en">
+           <outputs />
+           <translations />
            <release allow_pseudo="false" seq="1">
              <messages fallback_to_english="true" />
            </release>
-           <translations />
-           <outputs />
          </grit>'''), dir='.')
-    messages = root.children[0].children[0]
+    outputs = root.children[0]
     translations = root.children[1]
-    outputs = root.children[2]
+    messages = root.children[2].children[0]
     assert (isinstance(messages, grit.node.empty.MessagesNode) and
             isinstance(translations, grit.node.empty.TranslationsNode) and
             isinstance(outputs, grit.node.empty.OutputsNode))
 
     if self.header_dir:
       cpp_header = self.__CreateCppHeaderOutputNode(outputs, self.header_dir)
     for lang in self.languages:
       # Create an output element for each language.
       if self.rc_dir:
         self.__CreateRcOutputNode(outputs, lang, self.rc_dir)
@@ skipping 274 matching lines @@
     A <string> element is by default translatable unless otherwise marked.
     """
     if android_string.hasAttribute('translatable'):
       value = android_string.getAttribute('translatable').lower()
       if value not in ('true', 'false'):
         print 'Warning: translatable attribute has invalid value: %s' % value
       return value == 'true'
     else:
       return True