| commit | da2983f95be3f7eca6d48a775688c0c56f2bfed6 | [log] [tgz] |
|---|---|---|
| author | Geoff Mendal <mendal@google.com> | Wed Nov 26 20:11:25 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Wed Nov 26 20:11:25 2014 +0000 |
| tree | 445619ecfebb11acc3e4472f98d603997e2bc92d | |
| parent | deb6a9a6300188ea36f956f0e270e3dde6672a0f [diff] | |
| parent | 54a89ab40923bdaea85fd49d94f94eb51edeb9a9 [diff] |
am 54a89ab4: (-s ours) am aca062f7: (-s ours) Import translations. DO NOT MERGE * commit '54a89ab40923bdaea85fd49d94f94eb51edeb9a9': Import translations. DO NOT MERGE