| commit | ee82d2f21dc3f89f43601b3f60ed0155f0711c9f | [log] [tgz] |
|---|---|---|
| author | Baligh Uddin <baligh@google.com> | Sat Jan 31 01:09:12 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Sat Jan 31 01:09:12 2015 +0000 |
| tree | 10da860fcff71886af91d082e31f0e1917926848 | |
| parent | eaa035fb76fc521123a624ca86fa46fee3d94b3b [diff] | |
| parent | a703eb0fdf4b722939d601f667c0d123e86b59a7 [diff] |
am a703eb0f: (-s ours) am 68207e25: (-s ours) Merge "Import translations. DO NOT MERGE" into ub-now-porkchop * commit 'a703eb0fdf4b722939d601f667c0d123e86b59a7':