OSDN Git Service

am 8f113624: (-s ours) am 955f3477: Merge "Revert "Import translations. DO NOT MERGE...
authorBaligh Uddin <baligh@google.com>
Tue, 11 Sep 2012 00:16:02 +0000 (17:16 -0700)
committerAndroid Git Automerger <android-git-automerger@android.com>
Tue, 11 Sep 2012 00:16:02 +0000 (17:16 -0700)
commitea7a7d436676526cb14e55ed58ac66ef4349c8c7
treed3460cf4628679ee90171444e302be846dfbf005
parentddb438917056b815a89983a1472e212be6e36869
parent8f1136241df1544df54e653b007ca96da98ebae6
am 8f113624: (-s ours) am 955f3477: Merge "Revert "Import translations. DO NOT MERGE"" into jb-mr1-dev

* commit '8f1136241df1544df54e653b007ca96da98ebae6':
  Revert "Import translations. DO NOT MERGE"