tree 366f81f5f30f48e1ce0eedf84e751d0cbfd29fab
parent d1710fbb4053f80103b740c8b393b6cb4a480d6f
parent a7ce9785bf05c8e02fe6d507c9579a7d72fd5666
author Eric Fischer <enf@google.com> 1336508116 -0700
committer Android (Google) Code Review <android-gerrit@google.com> 1336508116 -0700

Merge "Import translations. DO NOT MERGE" into jb-dev