OSDN Git Service

am e11ec1df: am 47af771d: (-s ours) am 9ab3c624: Merge "Import revised translations...
authorEric Fischer <enf@google.com>
Tue, 29 Nov 2011 19:54:01 +0000 (11:54 -0800)
committerAndroid Git Automerger <android-git-automerger@android.com>
Tue, 29 Nov 2011 19:54:01 +0000 (11:54 -0800)
commit08159bc72f6b930fec5674e96dee264840e77ad5
treea3d18908fc1414742d97c93484de26b7ac8fffb9
parent781a9d52f9fac7451da1fb8d5f46b2358448e55f
parent4a0994e4ab4ecffe063511acf70d4cfaaed6c2cc
am e11ec1df: am 47af771d: (-s ours) am 9ab3c624: Merge "Import revised translations.  DO NOT MERGE" into ics-mr1

* commit 'e11ec1df421be0b1a18fd3cf6ec23361d86ca32a':
  Import revised translations.  DO NOT MERGE