| commit | 53c13a8766a4a758ee572acaa4121350050f25c7 | [log] [tgz] |
|---|---|---|
| author | Baligh Uddin <baligh@google.com> | Sat Jan 31 01:08:13 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Sat Jan 31 01:08:13 2015 +0000 |
| tree | 10da860fcff71886af91d082e31f0e1917926848 | |
| parent | 658fdd291b1bfaf7e7dbe40c34ecbf757a100d87 [diff] | |
| parent | b17186c7a451c29ff370aa0d8b590b2d10a600f4 [diff] |
am b17186c7: (-s ours) am bc566e74: (-s ours) Merge "Import translations. DO NOT MERGE" into ub-now-porkchop * commit 'b17186c7a451c29ff370aa0d8b590b2d10a600f4':