OSDN Git Service

am 7e40778b: (-s ours) am 37960312: (-s ours) Merge "Import translations. DO NOT...
authorBaligh Uddin <baligh@google.com>
Mon, 29 Sep 2014 21:02:41 +0000 (21:02 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Mon, 29 Sep 2014 21:02:41 +0000 (21:02 +0000)
commit374b10b58b7586689880cfd64342d1160d3a3532
treeeaa113bd4bb5f52de29ff0349a1d371170af57ab
parente037c0b1ad9bb82fd069bd09fe9582864d922466
parent7e40778bae0c58173116fb7e6d250abfdb9b5250
am 7e40778b: (-s ours) am 37960312: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-dev

* commit '7e40778bae0c58173116fb7e6d250abfdb9b5250':
  Import translations. DO NOT MERGE