| commit | a03893d175a6ca3239b135daeaf782aad9716bee | [log] [tgz] |
|---|---|---|
| author | Geoff Mendal <mendal@google.com> | Tue Nov 25 15:09:05 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Tue Nov 25 15:09:05 2014 +0000 |
| tree | 01c126788b8e441f33128f7273bc0fb2ad8e8b58 | |
| parent | b1a57cfbe145f8c45fa959dd13def021ba4d8dc9 [diff] | |
| parent | f0490f8405606d799509b418b2642a194d997e27 [diff] |
am f0490f84: (-s ours) am 867531f8: (-s ours) Import translations. DO NOT MERGE * commit 'f0490f8405606d799509b418b2642a194d997e27': Import translations. DO NOT MERGE