| commit | 751f64dfe244888f0ec3ef69a2c60df292b8fe64 | [log] [tgz] |
|---|---|---|
| author | Geoff Mendal <mendal@google.com> | Wed Jul 15 17:17:35 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Wed Jul 15 17:17:35 2015 +0000 |
| tree | 156318d1e7602a679e0bb7d9834512a17995ea14 | |
| parent | c73fabf6080518732c6662df8d227c23847d9831 [diff] | |
| parent | 4a44f43348b593c2e49d6c7c38aa987ba4cc5d6b [diff] |
am 4a44f433: (-s ours) am d6cba73e: (-s ours) am c8e261e9: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dev * commit '4a44f43348b593c2e49d6c7c38aa987ba4cc5d6b': Import translations. DO NOT MERGE