tree 34413b864be0be643126826258030449e10f0b18
parent 023d77e67b748f6b183b2b50272413c008e8b951
parent ca7b80e431fe8c742d396e84722eaf2f6b70a4d8
author Android (Google) Code Review <android-gerrit@google.com> 1243238337 -0700
committer Android (Google) Code Review <android-gerrit@google.com> 1243238337 -0700

Merge change 2408 into donut

* changes:
  Manual merge from cupcake_dcm. internal CL#148693. Two donottranslate.xml-s are already submitted.