OSDN Git Service

am a4a3b647: (-s ours) am 97750cc8: (-s ours) am 2f727aff: (-s ours) Merge "Import...
authorBaligh Uddin <baligh@google.com>
Mon, 27 Oct 2014 05:42:35 +0000 (05:42 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Mon, 27 Oct 2014 05:42:35 +0000 (05:42 +0000)
commit5afde77b103d77caf139b07c7239f6fb79cfd48b
tree12e119ed3edaa34f16fa1e8c25a3198061bb5358
parentbd7f79cbce5907ca928aeb8f4c0ed1184382bc89
parenta4a3b647921cf595ca57c422d00fd2cbcaf3e247
am a4a3b647: (-s ours) am 97750cc8: (-s ours) am 2f727aff: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-dev

* commit 'a4a3b647921cf595ca57c422d00fd2cbcaf3e247':