OSDN Git Service

am 379c809f: (-s ours) am 4b04b755: (-s ours) Merge "Revert "Import translations...
authorBaligh Uddin <baligh@google.com>
Wed, 30 Apr 2014 18:14:46 +0000 (18:14 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Wed, 30 Apr 2014 18:14:46 +0000 (18:14 +0000)
commit13e9cc57b631e87bb24fb98c96e4a9a63391eba7
tree3804e07840427a842ef1bdc750bffe2239123c26
parent405865159b97e5d4e7abe026547314e9ae0e2800
parent379c809f6ebb2ab0dfe73ac2182466dda80ab5e3
am 379c809f: (-s ours) am 4b04b755: (-s ours) Merge "Revert "Import translations. DO NOT MERGE"" into klp-ub-dev

* commit '379c809f6ebb2ab0dfe73ac2182466dda80ab5e3':
  Revert "Import translations. DO NOT MERGE"