aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBen Murdoch <benm@google.com>2014-03-31 11:52:15 +0100
committerBen Murdoch <benm@google.com>2014-03-31 11:52:15 +0100
commitb9e867e779e33cb8710a262e84b289e93e8fa3fa (patch)
tree3547d65d6673edf5a91bca870191dc9877a85367
parent502819df4bb6aba2350c60c5abd7b0d113c84ba9 (diff)
parent4cebc3a557e2390264e09fb4c63337a52f89f54a (diff)
downloadgrit-b9e867e779e33cb8710a262e84b289e93e8fa3fa.tar.gz
Merge from Chromium at DEPS revision 260458
This commit was generated by merge_to_master.py. Change-Id: If4b774ad99a11ef5f9fed899b6d07961ec89503a
-rw-r--r--grit/format/android_xml.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/grit/format/android_xml.py b/grit/format/android_xml.py
index e835e9b..d960bf4 100644
--- a/grit/format/android_xml.py
+++ b/grit/format/android_xml.py
@@ -112,7 +112,7 @@ def Format(root, lang='en', output_dir='.'):
raise Exception('env variable ANDROID_JAVA_TAGGED_ONLY must have value '
'true or false. Invalid value: %s' % tagged_only)
- for item in root.Preorder():
+ for item in root.ActiveDescendants():
with item:
if ShouldOutputNode(item, tagged_only):
yield _FormatMessage(item, lang)