commit | 31d949daee230446f52a5ac5667c0d4495831478 | [log] [tgz] |
---|---|---|
author | Baligh Uddin <baligh@google.com> | Mon Dec 03 21:21:06 2012 -0800 |
committer | Android Git Automerger <android-git-automerger@android.com> | Mon Dec 03 21:21:06 2012 -0800 |
tree | bfd958cb96112831d9af671feae52c9ff18df152 | |
parent | 5868368bd5780a46d43bd283859615b13d00ff82 [diff] | |
parent | ea71e29a4ba57641a5adc67ff12b46f214a32126 [diff] |
am ea71e29a: (-s ours) am a468a7e5: am 8ef5660e: Merge "Import translations. DO NOT MERGE" into jb-mr1.1-dev * commit 'ea71e29a4ba57641a5adc67ff12b46f214a32126': Import translations. DO NOT MERGE