OSDN Git Service

am 68207e25: (-s ours) Merge "Import translations. DO NOT MERGE" into ub-now-porkchop
authorBaligh Uddin <baligh@google.com>
Sat, 18 Oct 2014 16:05:41 +0000 (16:05 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Sat, 18 Oct 2014 16:05:41 +0000 (16:05 +0000)
commit6317598a196ada3f32950c7f4a8d5cfe005acf42
tree04a8869721e76d2963e64f6b4f1ac87276aa013e
parentacefecbff3141b43dc55fe18146cf842d1d4a8ae
parent68207e2532b2059e513a1c4e33c3c52e1ac1e559
am 68207e25: (-s ours) Merge "Import translations. DO NOT MERGE" into ub-now-porkchop

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