| commit | ff03e04713a8a0074c2294d1c83021000620321c | [log] [tgz] |
|---|---|---|
| author | Geoff Mendal <mendal@google.com> | Mon Oct 13 18:46:33 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Mon Oct 13 18:46:33 2014 +0000 |
| tree | 24945a41eec94300eec88463193d4905dc5bb302 | |
| parent | a074a5df739c3275287f03225ec01bae26cbc7ad [diff] | |
| parent | 164a49969e0ae8811f0e28ad6595421de501521d [diff] |
am 164a4996: (-s ours) Merge "Import translations. DO NOT MERGE" * commit '164a49969e0ae8811f0e28ad6595421de501521d': Import translations. DO NOT MERGE