OSDN Git Service

am 0d77548c: (-s ours) am 654d8805: (-s ours) Merge "Import translations. DO NOT...
authorGeoff Mendal <mendal@google.com>
Tue, 9 Dec 2014 22:23:10 +0000 (22:23 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Tue, 9 Dec 2014 22:23:10 +0000 (22:23 +0000)
commit35384e00ba7a88834a2fafd4d2c4e6c46a9fe522
tree17c20b02ee7d8a65d2ae1f2f0413233f79dcd2eb
parent089c6d79e3b6ad5d1f9503941cb9376596871268
parent0d77548cda02c3ab2e37d13cfc2edf57239c4372
am 0d77548c: (-s ours) am 654d8805: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-mr1-ub-dev

* commit '0d77548cda02c3ab2e37d13cfc2edf57239c4372':
  Import translations. DO NOT MERGE