tree 99126f2ecbc1a6447d31f5b9d15285d6a1245856
parent 6379312c0471c9af97c1d3136a47ee4134012b47
parent 3a2d7ee26d9f89e10e799c59b0c2d59bad8b349f
author Eric Fischer <enf@google.com> 1332537657 -0700
committer Android (Google) Code Review <android-gerrit@google.com> 1332537657 -0700

Merge "Import translations. DO NOT MERGE"