| commit | b4d4bcc1cf98e9a7b90d445dc12dc915b706e494 | [log] [tgz] |
|---|---|---|
| author | Baligh Uddin <baligh@google.com> | Fri Oct 31 17:20:56 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Fri Oct 31 17:20:56 2014 +0000 |
| tree | 82501efc7b922bf746ba4dbe7a24c29a5bbd17c6 | |
| parent | 99e91e50796548c0ad77718700f6b6f128cb098f [diff] | |
| parent | 753c65f067a7eddd5e271d29d450df3be77a5ccd [diff] |
am 753c65f0: (-s ours) am ed8b51a7: (-s ours) am 46315a3e: (-s ours) Merge "Import translations. DO NOT MERGE" into stage-aosp-master * commit '753c65f067a7eddd5e271d29d450df3be77a5ccd': Import translations. DO NOT MERGE