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