commit | 60feab4561685522a07f1df7dc0a9d51345390cc | [log] [tgz] |
---|---|---|
author | Geoff Mendal <mendal@google.com> | Mon Nov 25 14:24:32 2013 -0800 |
committer | Android Git Automerger <android-git-automerger@android.com> | Mon Nov 25 14:24:32 2013 -0800 |
tree | b08d07480ede078a07e79af1832e360afc22a94f | |
parent | 955ace240ff9881ef7d47605adbe6aae43014376 [diff] | |
parent | 6565cd3b9c899902c106e3cb1de57093ad9f9fc2 [diff] |
am 6565cd3b: (-s ours) am 30355654: (-s ours) Import translations. DO NOT MERGE * commit '6565cd3b9c899902c106e3cb1de57093ad9f9fc2': Import translations. DO NOT MERGE