| commit | 4e6fede9319d0f736e06dcfa97d8e7c25576616f | [log] [tgz] |
|---|---|---|
| author | Geoff Mendal <mendal@google.com> | Wed Apr 29 14:36:29 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Wed Apr 29 14:36:29 2015 +0000 |
| tree | a3e1c4993283fac252d75693a6d997b246f1a1aa | |
| parent | ab1de86af00b89cad32a2a91a483ce3c04ee908a [diff] | |
| parent | e9eba44f386e042bd7e4da5f7d9a9a41a422473a [diff] |
am 2d954c7b: (-s ours) am eb3d1a1b: (-s ours) am 62cb506f: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dev * commit '2d954c7b46b40033161f61bebfad213f97821a8d': Import translations. DO NOT MERGE