commit | eb6e0072758667df89ab0822aafc146ca3e3db58 | [log] [tgz] |
---|---|---|
author | Geoff Mendal <mendal@google.com> | Mon Oct 13 19:15:17 2014 +0000 |
committer | Android Git Automerger <android-git-automerger@android.com> | Mon Oct 13 19:15:17 2014 +0000 |
tree | 54de4600b6ff3b79a081f60022abe597b63a9426 | |
parent | 3b9baf7f8887d4353e703fbdd9c80e48ce18141e [diff] | |
parent | 04ce868a7d3af5b8c63ee10cbc3521ca469f3b62 [diff] |
am 04ce868a: (-s ours) am 8807b910: (-s ours) Import translations. DO NOT MERGE * commit '04ce868a7d3af5b8c63ee10cbc3521ca469f3b62': Import translations. DO NOT MERGE