commit | 0d619da9332cc2ca440ae3dd22b43335a6b5d358 | [log] [tgz] |
---|---|---|
author | Geoff Mendal <mendal@google.com> | Thu Aug 27 11:28:24 2015 +0000 |
committer | Android Git Automerger <android-git-automerger@android.com> | Thu Aug 27 11:28:24 2015 +0000 |
tree | edb91ce7e7c9dc6d33389277e2e2adcac1d36854 | |
parent | d70d63fa435e87878766311676cb6e87135c4f99 [diff] | |
parent | 3a7194e98e7dd84f49fe3bd1e25807d5599008f2 [diff] |
am 3a7194e9: (-s ours) am 285c9d82: (-s ours) Import translations. DO NOT MERGE * commit '3a7194e98e7dd84f49fe3bd1e25807d5599008f2':