| commit | d1a4d42dc4578703f32383f02ef015d7a477ec64 | [log] [tgz] |
|---|---|---|
| author | Baligh Uddin <baligh@google.com> | Fri Feb 14 20:58:40 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Fri Feb 14 20:58:40 2014 +0000 |
| tree | 4e7ec699006b78d116024621f74302c250c1cfaa | |
| parent | a697cbecceccbfd610bf08fdaae2c5b95f501783 [diff] | |
| parent | 9d321ecf5c1ed4b3d24b0c227e4b70fc24036279 [diff] |
am 9d321ecf: (-s ours) am ab9135e4: (-s ours) am d40b2e99: (-s ours) am 4e4d6599: (-s ours) Merge "Import translations. DO NOT MERGE" into jb-ub-now-jetsonic * commit '9d321ecf5c1ed4b3d24b0c227e4b70fc24036279': Import translations. DO NOT MERGE