| commit | 465e15da9b54e29d3f0b1a7cfe5ea3be0c5b5e96 | [log] [tgz] |
|---|---|---|
| author | Jay Shrauner <shrauner@google.com> | Wed Jan 08 22:33:06 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Wed Jan 08 22:33:06 2014 +0000 |
| tree | b91ce25e110d6212cb7789c8a49660932d69369f | |
| parent | e9a252861eedb0dac465f7da61afb5ab6ec30167 [diff] | |
| parent | 6a227701c35bb9cbcfc0aeb74a878d8557893847 [diff] |
am 6a227701: (-s ours) am 06321aaa: (-s ours) am 8297ceeb: (-s ours) am f9dd751e: (-s ours) Merge "Import translations. DO NOT MERGE" * commit '6a227701c35bb9cbcfc0aeb74a878d8557893847': Import translations. DO NOT MERGE