OSDN Git Service

am 25d1d268: (-s ours) am 0fc225ed: am 744c5b0b: Merge "Import translations. DO NOT...
authorJustin Ho <justinho@google.com>
Fri, 10 Feb 2012 18:51:52 +0000 (10:51 -0800)
committerAndroid Git Automerger <android-git-automerger@android.com>
Fri, 10 Feb 2012 18:51:52 +0000 (10:51 -0800)
* commit '25d1d268c1b00734f4bdd7fcb85ced97645a7f29':


Trivial merge