| commit | 637186e12b3ece6c54c2a4a74e2eb851030ad816 | [log] [tgz] |
|---|---|---|
| author | Geoff Mendal <mendal@google.com> | Mon Jan 26 15:29:12 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Mon Jan 26 15:29:12 2015 +0000 |
| tree | 2fd83c97db5a6ee24e595eba9925814cecad96ac | |
| parent | 854e632aada4cc693902dc3d997fe9127a7efc3c [diff] | |
| parent | 956fb8caf1af11d09e7370d236c70766114f95c1 [diff] |
am 956fb8ca: (-s ours) Import translations. DO NOT MERGE automerge: f916950 -s ours * commit '956fb8caf1af11d09e7370d236c70766114f95c1': Import translations. DO NOT MERGE