| commit | b2857d7e37882b8286f711c9829275fc95ee3ac0 | [log] [tgz] |
|---|---|---|
| author | Baligh Uddin <baligh@google.com> | Fri Oct 31 17:14:29 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Fri Oct 31 17:14:29 2014 +0000 |
| tree | 1334856479a7668f324d567e998d014d2b71096e | |
| parent | d9aa0fb33a67b0bb4e1bc66fa850188cda7eed89 [diff] | |
| parent | 9ce5f3d3da76ad628de1b6c4f155b7b543f35581 [diff] |
am 9ce5f3d3: (-s ours) Merge "Import translations. DO NOT MERGE" into stage-aosp-master * commit '9ce5f3d3da76ad628de1b6c4f155b7b543f35581': Import translations. DO NOT MERGE