OSDN Git Service

am 0baeee0c: (-s ours) am 79670bbe: (-s ours) Import translations. DO NOT MERGE
authorGeoff Mendal <mendal@google.com>
Tue, 28 Apr 2015 14:54:56 +0000 (14:54 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Tue, 28 Apr 2015 14:54:56 +0000 (14:54 +0000)
commit392858626b0b4583a71372a9b05be94927958d2f
tree6b1e919825a70663c5a43f54f9aee99e88eec354
parentd508cd9b6f7d7e567d1989be4b365bfee0112704
parent0baeee0c0df1cc0f8b8f23b5860b7d2ba1720432
am 0baeee0c: (-s ours) am 79670bbe: (-s ours) Import translations. DO NOT MERGE

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