OSDN Git Service

am 6e657227: am f71589e4: (-s ours) am 55ec71e7: (-s ours) Merge "Import translations...
authorBaligh Uddin <baligh@google.com>
Mon, 5 Nov 2012 23:39:50 +0000 (15:39 -0800)
committerAndroid Git Automerger <android-git-automerger@android.com>
Mon, 5 Nov 2012 23:39:50 +0000 (15:39 -0800)
commit850fa9cdb847bd8b80f119b43099c6e2dac99d17
tree3a5f097a20836ab85a99a015604ce2d66773866e
parent3f88803dc0d2aebf408dd12860ef101ef79df534
parent6e6572275c4b810281fe261545f8c3b48cf73568
am 6e657227: am f71589e4: (-s ours) am 55ec71e7: (-s ours) Merge "Import translations. DO NOT MERGE" into jb-mr1-dev

* commit '6e6572275c4b810281fe261545f8c3b48cf73568':