| commit | 8057d62d13c863e56163e904659a4e4ac7c05f2f | [log] [tgz] |
|---|---|---|
| author | Baligh Uddin <baligh@google.com> | Sat Jan 31 01:07:57 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Sat Jan 31 01:07:57 2015 +0000 |
| tree | 10da860fcff71886af91d082e31f0e1917926848 | |
| parent | 48b1afd013d6f0bf23f7e9531cb09088f4a7a234 [diff] | |
| parent | 132f44ca8125db4aa1c8fa28238c3f37ad67b358 [diff] |
am 132f44ca: (-s ours) am bdfc17ce: (-s ours) Merge "Import translations. DO NOT MERGE" into ub-now-porkchop * commit '132f44ca8125db4aa1c8fa28238c3f37ad67b358':