OSDN Git Service

am c6c03575: (-s ours) am ca8f9977: (-s ours) Merge "Import translations. DO NOT...
authorBaligh Uddin <baligh@google.com>
Sun, 17 Aug 2014 14:15:38 +0000 (14:15 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Sun, 17 Aug 2014 14:15:38 +0000 (14:15 +0000)
commit8dab68b14768a595f15bfb4eac6668fdc7e8c835
tree906ca8abbd6720bb780ea610f165731aa4ba4004
parentd61723ee998da263ee4a6f7c98d772ed4aade4fb
parent6efa1e43db0308dc50e07ce0d0c0b84fd828b329
am c6c03575: (-s ours) am ca8f9977: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-dev

* commit 'c6c03575952d6351967f8202306544a9e5bdf723':
  Import translations. DO NOT MERGE