| commit | 8832a1274886b9a5b4ca2305b6e973b171d995a1 | [log] [tgz] |
|---|---|---|
| author | Baligh Uddin <baligh@google.com> | Fri Oct 31 17:20:58 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Fri Oct 31 17:20:58 2014 +0000 |
| tree | 82501efc7b922bf746ba4dbe7a24c29a5bbd17c6 | |
| parent | b4d4bcc1cf98e9a7b90d445dc12dc915b706e494 [diff] | |
| parent | d064c6448129ea4415479a865296bde98a402641 [diff] |
am d064c644: (-s ours) am 929e97e4: (-s ours) am 46905cfd: (-s ours) Merge "Import translations. DO NOT MERGE" into stage-aosp-master * commit 'd064c6448129ea4415479a865296bde98a402641': Import translations. DO NOT MERGE