OSDN Git Service

am f71589e4: (-s ours) am 55ec71e7: (-s ours) Merge "Import translations. DO NOT...
authorBaligh Uddin <baligh@google.com>
Mon, 5 Nov 2012 23:37:43 +0000 (15:37 -0800)
committerAndroid Git Automerger <android-git-automerger@android.com>
Mon, 5 Nov 2012 23:37:43 +0000 (15:37 -0800)
commit6e6572275c4b810281fe261545f8c3b48cf73568
tree3a5f097a20836ab85a99a015604ce2d66773866e
parent2f0d749f0ad344f27cda2f569e328daa7784b04d
parentf71589e474392a62a41ab22da3bdd14d078611b8
am f71589e4: (-s ours) am 55ec71e7: (-s ours) Merge "Import translations. DO NOT MERGE" into jb-mr1-dev

* commit 'f71589e474392a62a41ab22da3bdd14d078611b8':