tree 04a8869721e76d2963e64f6b4f1ac87276aa013e
parent acefecbff3141b43dc55fe18146cf842d1d4a8ae
parent 68207e2532b2059e513a1c4e33c3c52e1ac1e559
author Baligh Uddin <baligh@google.com> 1413648341 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1413648341 +0000

am 68207e25: (-s ours) Merge "Import translations. DO NOT MERGE" into ub-now-porkchop

* commit '68207e2532b2059e513a1c4e33c3c52e1ac1e559':
  Import translations. DO NOT MERGE