| commit | 525833bea31390ba3e7f72839e547b705080e4c5 | [log] [tgz] |
|---|---|---|
| author | Geoff Mendal <mendal@google.com> | Wed Dec 17 17:54:19 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Wed Dec 17 17:54:19 2014 +0000 |
| tree | 08004c06a6bf1473aa571ae3ffd690e2f0af3eb2 | |
| parent | 3c0abd408797a960f29575fe173011b87dc4ddf3 [diff] | |
| parent | 296aa925171b27a87b427575a9a462dc8a8620b2 [diff] |
am 296aa925: (-s ours) Import translations. DO NOT MERGE automerge: 43741a8 -s ours * commit '296aa925171b27a87b427575a9a462dc8a8620b2': Import translations. DO NOT MERGE