OSDN Git Service

am 6f1346f8: (-s ours) am d0fff8a7: (-s ours) Merge "Revert "Import translations...
authorBaligh Uddin <baligh@google.com>
Tue, 8 Oct 2013 04:23:02 +0000 (21:23 -0700)
committerAndroid Git Automerger <android-git-automerger@android.com>
Tue, 8 Oct 2013 04:23:02 +0000 (21:23 -0700)
commitb9358143036925d4a0fd88e3ee26b00d6f0eaf59
tree94a5bdb2db03f8c77115492c3baa002d4bf73618
parent2f97233f8ae7678c19d4a6fb729be1eb9238d2a3
parent6f1346f8a29f6d5878b65273b5f783909137e853
am 6f1346f8: (-s ours) am d0fff8a7: (-s ours) Merge "Revert "Import translations. DO NOT MERGE"" into klp-dev

* commit '6f1346f8a29f6d5878b65273b5f783909137e853':
  Revert "Import translations. DO NOT MERGE"