| commit | 8b282e7e06858cf263e9e7a483efedf5f3eaa7a3 | [log] [tgz] |
|---|---|---|
| author | Geoff Mendal <mendal@google.com> | Wed Dec 17 18:00:07 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Wed Dec 17 18:00:07 2014 +0000 |
| tree | 79723f8041c60c800b1d6d94f02dd3b1f421fa26 | |
| parent | 7d4797361f446357f0c55b60955f8cb70311c8fb [diff] | |
| parent | 525833bea31390ba3e7f72839e547b705080e4c5 [diff] |
am 525833be: (-s ours) am 296aa925: (-s ours) Import translations. DO NOT MERGE automerge: 43741a8 -s ours * commit '525833bea31390ba3e7f72839e547b705080e4c5': Import translations. DO NOT MERGE