| commit | 385f2d18c631190fc9eb0ea14b288f5589a1f30c | [log] [tgz] |
|---|---|---|
| author | Geoff Mendal <mendal@google.com> | Mon Jul 20 20:42:40 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Mon Jul 20 20:42:40 2015 +0000 |
| tree | 8aa3290d2c15685bfbbf70844193ced3d99615f4 | |
| parent | 01fda52778ef3b2a8a3d7ea76e65fea2705ab3e5 [diff] | |
| parent | 6b12a5fea1e8799496f61bf02f927839038b3f33 [diff] |
am 6b12a5fe: (-s ours) am 5038b92e: (-s ours) am ddb33d7d: (-s ours) am a6bf393d: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dev * commit '6b12a5fea1e8799496f61bf02f927839038b3f33': Import translations. DO NOT MERGE