commit | 179abb55a8b5816fef0e0cacd9adac1fb408f2d6 | [log] [tgz] |
---|---|---|
author | Geoff Mendal <mendal@google.com> | Thu May 21 19:25:24 2015 +0000 |
committer | Android Git Automerger <android-git-automerger@android.com> | Thu May 21 19:25:24 2015 +0000 |
tree | 5b5a3ee57dd9060120e9c71168605cad30811835 | |
parent | da8ffea82f4215f49f0fd1281c52cd1d9df3678b [diff] | |
parent | d3001a48f30ceab327467099102d357b7918aab3 [diff] |
am 8fcc857e: (-s ours) am 2d10c26e: (-s ours) am 2ab7e0d5: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dev * commit '8fcc857e82a73551838df54c629192f7e7767081': Import translations. DO NOT MERGE