| commit | b0524c338cd747158893930d58f6fe06ad1df898 | [log] [tgz] |
|---|---|---|
| author | Geoff Mendal <mendal@google.com> | Wed Jul 15 23:18:06 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Wed Jul 15 23:18:06 2015 +0000 |
| tree | 323dff3d9e7c49535aae15276c52509ed2d6af0b | |
| parent | b5f916187a54fc8c462344bf966391048745ebc2 [diff] | |
| parent | 34cfc5c83ddaad59c9aa8cf047b36f73e5dfee65 [diff] |
am 34cfc5c8: (-s ours) am c05bf35e: (-s ours) am ccec9777: (-s ours) am 6e149a25: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dev * commit '34cfc5c83ddaad59c9aa8cf047b36f73e5dfee65': Import translations. DO NOT MERGE