commit | aa5c62f35999c2dc165771740e96c30b1b932aeb | [log] [tgz] |
---|---|---|
author | Geoff Mendal <mendal@google.com> | Mon Oct 06 19:17:23 2014 +0000 |
committer | Android Git Automerger <android-git-automerger@android.com> | Mon Oct 06 19:17:23 2014 +0000 |
tree | f51665035723666670f9b28001fd631ca11aaad0 | |
parent | 39006668235f9cdeac853911426b1543d3b092d0 [diff] | |
parent | 712363889899bfff564a39ef4d88ff048a9e5ec7 [diff] |
am 71236388: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-dev * commit '712363889899bfff564a39ef4d88ff048a9e5ec7': Import translations. DO NOT MERGE