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