| commit | e17e5a4e4d140914e6dbab38dc4e667b7e49c946 | [log] [tgz] |
|---|---|---|
| author | Baligh Uddin <baligh@google.com> | Tue Sep 16 16:50:14 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Tue Sep 16 16:50:14 2014 +0000 |
| tree | 4ca5bf08fec99db207fca7335ae5c5b02d34ad92 | |
| parent | 3e3e1126d588bb1fb1879c34a0f9963206ec8f22 [diff] | |
| parent | e03ea334d2bb88ff10ccf5b3622f0b81aee07ce9 [diff] |
am e03ea334: (-s ours) am 60493b32: (-s ours) Import translations. DO NOT MERGE * commit 'e03ea334d2bb88ff10ccf5b3622f0b81aee07ce9': Import translations. DO NOT MERGE