| commit | 417f375851d1808dcea9a9b301c9055e49f99914 | [log] [tgz] |
|---|---|---|
| author | Geoff Mendal <mendal@google.com> | Wed Jul 15 17:37:10 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Wed Jul 15 17:37:10 2015 +0000 |
| tree | 156318d1e7602a679e0bb7d9834512a17995ea14 | |
| parent | cf090fc76ebdb15d4049288e78067fe57844c637 [diff] | |
| parent | c73fabf6080518732c6662df8d227c23847d9831 [diff] |
am c73fabf6: (-s ours) am b8d881f2: (-s ours) am cce9728e: (-s ours) am cf849b40: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dev * commit 'c73fabf6080518732c6662df8d227c23847d9831': Import translations. DO NOT MERGE