OSDN Git Service

am 91e9ae50: (-s ours) am 039e80be: am 4ecaa689: am 5ac0bdab: (-s ours) Merge "Import...
authorBaligh Uddin <baligh@google.com>
Mon, 5 Nov 2012 23:59:33 +0000 (15:59 -0800)
committerAndroid Git Automerger <android-git-automerger@android.com>
Mon, 5 Nov 2012 23:59:33 +0000 (15:59 -0800)
commit41306f9ec9c747ff2d5c6688dfff4e6c82088266
treef5fd1d68ca06b6b610d85cb0084adf5d0c4f9822
parentc67921a54fd115ebbf03f5592e43d8a91584e61f
parent91e9ae50ece01f7489f9ca20bc5373041d46ddd0
am 91e9ae50: (-s ours) am 039e80be: am 4ecaa689: am 5ac0bdab: (-s ours) Merge "Import translations. DO NOT MERGE" into jb-mr1-dev

* commit '91e9ae50ece01f7489f9ca20bc5373041d46ddd0':