| commit | d064c6448129ea4415479a865296bde98a402641 | [log] [tgz] |
|---|---|---|
| author | Baligh Uddin <baligh@google.com> | Fri Oct 31 17:16:11 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Fri Oct 31 17:16:11 2014 +0000 |
| tree | 83d386ee7a2edfd541e0c88f8f044c4bcd3c9334 | |
| parent | 753c65f067a7eddd5e271d29d450df3be77a5ccd [diff] | |
| parent | 929e97e40bd74a6de8ed619e145a332ab1134e81 [diff] |
am 929e97e4: (-s ours) am 46905cfd: (-s ours) Merge "Import translations. DO NOT MERGE" into stage-aosp-master * commit '929e97e40bd74a6de8ed619e145a332ab1134e81': Import translations. DO NOT MERGE