| commit | 4d800712fede926f93f811b195c7935e0680e9ec | [log] [tgz] |
|---|---|---|
| author | Geoff Mendal <mendal@google.com> | Mon Dec 01 20:00:18 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Mon Dec 01 20:00:18 2014 +0000 |
| tree | 8be5c78fea5408caf8dc5e14f32e8de50ff6a686 | |
| parent | 13ca50bcd6aada808f6df48ff6a632904ef05c5e [diff] | |
| parent | 01e05fd20e12d5ff978365b1e2bd78fd5643c1eb [diff] |
am 01e05fd2: (-s ours) am 299f6a77: (-s ours) Import translations. DO NOT MERGE * commit '01e05fd20e12d5ff978365b1e2bd78fd5643c1eb': Import translations. DO NOT MERGE