tree 0228c42aa4201f5d331c40f8b3e0177b9100c829
parent 1384638e6f1f9b925c24b3e359ef09cc453c9ee5
parent 3153ff2de7d83f9a4bd4d8db0629aab6bbab8a12
author Eric Fischer <enf@google.com> 1336585945 -0700
committer Android (Google) Code Review <android-gerrit@google.com> 1336585945 -0700

Merge "Import translations. DO NOT MERGE"