tree 71d4089e88e5168acbb9991488ec54d696e5b450
parent 516c25b38a03decc8f9cbd41f4d9baa4f52f438f
parent 1f2740cd733c46085e6a9e3cb7315f00c18d19f5
author Eric Fischer <enf@google.com> 1336166183 -0700
committer Android (Google) Code Review <android-gerrit@google.com> 1336166183 -0700

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