OSDN Git Service

am 132f44ca: (-s ours) am bdfc17ce: (-s ours) Merge "Import translations. DO NOT...
authorBaligh Uddin <baligh@google.com>
Sat, 31 Jan 2015 01:07:57 +0000 (01:07 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Sat, 31 Jan 2015 01:07:57 +0000 (01:07 +0000)
* commit '132f44ca8125db4aa1c8fa28238c3f37ad67b358':


Trivial merge