tree d1103f511dc645b4107235d4b273a519aeec74a4
parent a00673c7d9f3fcfc81a6e1c6aa7b831951331e84
parent a5ebcd63d71558d62d2e523002e23884299363e0
author Baligh Uddin <baligh@google.com> 1408081874 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 1408077143 +0000

Merge "Import translations. DO NOT MERGE" into ub-now-porkchop