commit | 0c2de5faa50ed01dda4d2ad14666d64e2dd8c9ca | [log] [tgz] |
---|---|---|
author | Geoff Mendal <mendal@google.com> | Mon Feb 23 14:27:02 2015 +0000 |
committer | Android Git Automerger <android-git-automerger@android.com> | Mon Feb 23 14:27:02 2015 +0000 |
tree | 8c7f309be6c6cb6fed17837c1ee688d643023360 | |
parent | c8a4babe93e4fd0cecb6b91a020b9252ac426004 [diff] | |
parent | 5f28b32ce6f5fe99af76b2c8e8c95e9fd148a530 [diff] |
am 5f28b32c: (-s ours) am dc82f4ce: (-s ours) Import translations. DO NOT MERGE * commit '5f28b32ce6f5fe99af76b2c8e8c95e9fd148a530': Import translations. DO NOT MERGE