commit | 276378eac39144462b1a5c5b522a00d8066b26d9 | [log] [tgz] |
---|---|---|
author | Geoff Mendal <mendal@google.com> | Fri Feb 13 01:31:54 2015 +0000 |
committer | Android Git Automerger <android-git-automerger@android.com> | Fri Feb 13 01:31:54 2015 +0000 |
tree | b7080f8b489297b5385fde4c5506b52d57daabf9 | |
parent | b9f626126cbf167e20dcc94e1c47e0c191e0e785 [diff] | |
parent | fde553b2738899ddf430b046ede3a9539790f989 [diff] |
am fde553b2: (-s ours) am 4bca1b8b: (-s ours) Import translations. DO NOT MERGE * commit 'fde553b2738899ddf430b046ede3a9539790f989': Import translations. DO NOT MERGE