OSDN Git Service

am 4bd2b9b5: (-s ours) am f5cafa5a: (-s ours) Merge "Import translations. DO NOT...
authorBaligh Uddin <baligh@google.com>
Fri, 12 Sep 2014 23:06:08 +0000 (23:06 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Fri, 12 Sep 2014 23:06:08 +0000 (23:06 +0000)
commitf1eeedb796786fc060cc38f10809d0593a6ca40a
treeb7fb14d5c114e6b9524bc3fe7731468f5b925517
parent31e3d15fff19598aebf89b29a2dc56488c50a219
parent4bd2b9b5c5b55c48e2775e627caf2a7a73722e9a
am 4bd2b9b5: (-s ours) am f5cafa5a: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-sprout-dev

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