| commit | b3988743af7828a0794bfb562b7f6695cf418d7a | [log] [tgz] |
|---|---|---|
| author | Baligh Uddin <baligh@google.com> | Tue Apr 29 21:13:42 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Tue Apr 29 21:13:42 2014 +0000 |
| tree | cff7a16d4153092734b7f58e0c7ff1c335521201 | |
| parent | 5f08b3ec9c1b518583ee527b83854dbf818501f7 [diff] | |
| parent | 86af7745d337f79b37e25e21f699bf04a46838be [diff] |
am 86af7745: (-s ours) am c2e5503d: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-modular-dev * commit '86af7745d337f79b37e25e21f699bf04a46838be': Import translations. DO NOT MERGE