| commit | 491c11baa49d6aebf808eddf94878c482fc8087c | [log] [tgz] |
|---|---|---|
| author | Baligh Uddin <baligh@google.com> | Sun Oct 05 18:05:56 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Sun Oct 05 18:05:56 2014 +0000 |
| tree | a35a5cb57ebcb4a6e7bbbfe3f21d813e6be70f4a | |
| parent | 9acd8b2652fa615bda4c033e70cb15722ef49ce4 [diff] | |
| parent | 0da4783cb72ed1e3cbf4fe0e1c9abf66a07b9b4b [diff] |
am 0da4783c: (-s ours) am 8b5a7318: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-sprout-dev * commit '0da4783cb72ed1e3cbf4fe0e1c9abf66a07b9b4b': Import translations. DO NOT MERGE