| commit | a244402da1de13a5fccfe64fcf19817d9f123de3 | [log] [tgz] |
|---|---|---|
| author | Geoff Mendal <mendal@google.com> | Mon Jun 29 17:26:08 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Mon Jun 29 17:26:08 2015 +0000 |
| tree | 55472116da6a1206d5d2231d4a3d5f0cd9f3d393 | |
| parent | 516dfbe39fae7fa1874fb31a5bad6def3e1de392 [diff] | |
| parent | da616ea6644c5b363d770badf22db44ed25cc267 [diff] |
am da616ea6: (-s ours) am 62efaf15: (-s ours) am 208daa1d: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dev * commit 'da616ea6644c5b363d770badf22db44ed25cc267': Import translations. DO NOT MERGE