| commit | 28b90dce0b5187c593248eef049cd588088e63c0 | [log] [tgz] |
|---|---|---|
| author | Baligh Uddin <baligh@google.com> | Fri Oct 31 17:16:12 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Fri Oct 31 17:16:12 2014 +0000 |
| tree | 83d386ee7a2edfd541e0c88f8f044c4bcd3c9334 | |
| parent | d064c6448129ea4415479a865296bde98a402641 [diff] | |
| parent | 971297e38d02b6ea236e08f28c7d5cb3ee44e33f [diff] |
am 971297e3: (-s ours) am 084de3c9: (-s ours) Merge "Import translations. DO NOT MERGE" into stage-aosp-master * commit '971297e38d02b6ea236e08f28c7d5cb3ee44e33f': Import translations. DO NOT MERGE