tree 26637abd6b0b24ced3f4e667ca1cbae83b713066
parent 0e5a56d62d188170c8e869d55e875250d0167dff
parent 527e247ce6e1afb0695ca03f75961dd75dbd2b2c
author Eric Fischer <enf@google.com> 1331583012 -0700
committer Android (Google) Code Review <android-gerrit@google.com> 1331583012 -0700

Merge "Import translations. DO NOT MERGE"