| commit | 0c6ee6d3f928bf1915a249ed13a4c3635bb21879 | [log] [tgz] |
|---|---|---|
| author | Geoff Mendal <mendal@google.com> | Mon Jun 29 17:26:27 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Mon Jun 29 17:26:27 2015 +0000 |
| tree | 55472116da6a1206d5d2231d4a3d5f0cd9f3d393 | |
| parent | a244402da1de13a5fccfe64fcf19817d9f123de3 [diff] | |
| parent | 9babebea40243f97222b4f7e780642b95566722a [diff] |
am 9babebea: (-s ours) am 511a1aca: (-s ours) am e3fc5415: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dev * commit '9babebea40243f97222b4f7e780642b95566722a': Import translations. DO NOT MERGE