| commit | 935254e1b2922239fa3f23dfd053f9b95fcbc007 | [log] [tgz] |
|---|---|---|
| author | Geoff Mendal <mendal@google.com> | Mon Apr 27 15:50:28 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Mon Apr 27 15:50:28 2015 +0000 |
| tree | 42d2935946ef8bbfc064797ae32f6ad545038348 | |
| parent | 4f630520000705a2afc4dad459c813b2edf27cb8 [diff] | |
| parent | 228cbc7f31b09c0ccce03c1c05c24b7db2af7096 [diff] |
am f7cab778: (-s ours) am 5bb07d3d: (-s ours) am 694a55b6: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dev * commit 'f7cab7785557531dc4f6ddb11c6d30fd4d2a7ed8': Import translations. DO NOT MERGE