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