| commit | 1dd8d00ba22c44e83139af7fe2261936219863c9 | [log] [tgz] |
|---|---|---|
| author | Baligh Uddin <baligh@google.com> | Sat Oct 18 16:08:10 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Sat Oct 18 16:08:10 2014 +0000 |
| tree | f9466ea7b3bdc409b0611b77f05e6a55b6a5ea1f | |
| parent | 824be94f31cfbb7f09bc3999bb44b084cff3ab45 [diff] | |
| parent | 6317598a196ada3f32950c7f4a8d5cfe005acf42 [diff] |
am 6317598a: (-s ours) am 68207e25: (-s ours) Merge "Import translations. DO NOT MERGE" into ub-now-porkchop * commit '6317598a196ada3f32950c7f4a8d5cfe005acf42': Import translations. DO NOT MERGE