| commit | d3b5b7c1bc8d543367d6d4438baea5ca9f5863b2 | [log] [tgz] |
|---|---|---|
| author | Geoff Mendal <mendal@google.com> | Thu Feb 12 23:44:53 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Thu Feb 12 23:44:53 2015 +0000 |
| tree | 7ce444eaadcf7bfa3b56c261ebfcc1a0fb4427da | |
| parent | 0d37ccf36dd32f6473d50c104fe10a79c36c4798 [diff] | |
| parent | 290128fe313495def5926bb7be0cda44f04ab1c6 [diff] |
am 290128fe: (-s ours) am 57b6d085: (-s ours) Import translations. DO NOT MERGE * commit '290128fe313495def5926bb7be0cda44f04ab1c6': Import translations. DO NOT MERGE