| commit | 99e91e50796548c0ad77718700f6b6f128cb098f | [log] [tgz] |
|---|---|---|
| author | Baligh Uddin <baligh@google.com> | Fri Oct 31 17:20:54 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Fri Oct 31 17:20:54 2014 +0000 |
| tree | 82501efc7b922bf746ba4dbe7a24c29a5bbd17c6 | |
| parent | b1087f77767c4f0fbbd00a255365e171921fce80 [diff] | |
| parent | cab2a02aa7ca12f9c970a82b69a4cf41e6d07ff1 [diff] |
am cab2a02a: (-s ours) am 7fe0ea42: (-s ours) am f8de10ce: (-s ours) Merge "Import translations. DO NOT MERGE" into stage-aosp-master * commit 'cab2a02aa7ca12f9c970a82b69a4cf41e6d07ff1': Import translations. DO NOT MERGE