| commit | 8297ceeb91510b9a5f3d162163799a11fc8f6100 | [log] [tgz] |
|---|---|---|
| author | Jay Shrauner <shrauner@google.com> | Wed Jan 08 14:24:28 2014 -0800 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Wed Jan 08 14:24:28 2014 -0800 |
| tree | b91ce25e110d6212cb7789c8a49660932d69369f | |
| parent | 0c52af7a3e137f131dcec1c45589291296911a87 [diff] | |
| parent | f9dd751e527f6857054ce67beb4cbacfad6d0c92 [diff] |
am f9dd751e: (-s ours) Merge "Import translations. DO NOT MERGE" * commit 'f9dd751e527f6857054ce67beb4cbacfad6d0c92': Import translations. DO NOT MERGE