| commit | 945a94f870cd9e7311788ff9cb65593846a780aa | [log] [tgz] |
|---|---|---|
| author | Geoff Mendal <mendal@google.com> | Mon Jun 15 13:14:10 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Mon Jun 15 13:14:10 2015 +0000 |
| tree | e6ace7934bea976f32519a290cd3f7a8abd8195b | |
| parent | 28ba13505202360c4cb8e56d444589476612b0c6 [diff] | |
| parent | 5fbae2e7b65d9827278468d893983573b36291bd [diff] |
am 5fbae2e7: (-s ours) am 640a0c95: (-s ours) Import translations. DO NOT MERGE * commit '5fbae2e7b65d9827278468d893983573b36291bd': Import translations. DO NOT MERGE