OSDN Git Service

am 41e16eaa: (-s ours) am 8b24b374: am 78ef5443: Import translations. DO NOT MERGE
authorEric Fischer <enf@google.com>
Fri, 10 Feb 2012 18:54:05 +0000 (10:54 -0800)
committerAndroid Git Automerger <android-git-automerger@android.com>
Fri, 10 Feb 2012 18:54:05 +0000 (10:54 -0800)
* commit '41e16eaa038fe4adeb8a3566b440aa23c1928c98':


Trivial merge