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