OSDN Git Service

am 4ae0268e: (-s ours) am 44cbb9f2: (-s ours) am 2d6e077d: (-s ours) Merge "Import...
authorBaligh Uddin <baligh@google.com>
Wed, 23 Apr 2014 02:24:01 +0000 (02:24 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Wed, 23 Apr 2014 02:24:01 +0000 (02:24 +0000)
commitb0e6556de597cd9c18441aacee88357d0cef21eb
treefeb783ef2cbcea5887ef93264ed075b5f4dac9b4
parent4281f78242c0e518629459f2054d786855fa42bb
parent4ae0268ec57c5b4a683d685c209942dc2d0b78d7
am 4ae0268e: (-s ours) am 44cbb9f2: (-s ours) am 2d6e077d: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-modular-dev

* commit '4ae0268ec57c5b4a683d685c209942dc2d0b78d7':
  Import translations. DO NOT MERGE