| commit | eae0b81fdaa23a5309bfb16f94119553407dff5f | [log] [tgz] |
|---|---|---|
| author | Geoff Mendal <mendal@google.com> | Tue Oct 07 00:06:17 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Tue Oct 07 00:06:17 2014 +0000 |
| tree | 3fbda0eef41357bcc0d76406b841edfe9491d16a | |
| parent | da92846bd69378713dc2cf52de95267852d6d1c2 [diff] | |
| parent | 5a70daee5f5b9cf5b19bb00559f63a5a2a69c66f [diff] |
am 5a70daee: (-s ours) am 3c172e39: (-s ours) am 1777f6d0: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-sprout-dev * commit '5a70daee5f5b9cf5b19bb00559f63a5a2a69c66f': Import translations. DO NOT MERGE