tree acbc353a5e79afc1e3d74f5720d5a049b150dd9e
parent be365165ed00205265c1876c4829fa9ac630da2a
parent 7c801257dd6638484532f444403785a62b5a4172
author Eric Fischer <enf@google.com> 1336414671 -0700
committer Android (Google) Code Review <android-gerrit@google.com> 1336414671 -0700

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