| commit | b1378e7ed8eb318a3e570aa47047830ef7a6eea0 | [log] [tgz] |
|---|---|---|
| author | Geoff Mendal <mendal@google.com> | Tue Apr 28 15:16:54 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Tue Apr 28 15:16:54 2015 +0000 |
| tree | 42d2935946ef8bbfc064797ae32f6ad545038348 | |
| parent | 92a6b9999e0d4164b7ebb5b2b0eb929d99ac1ffe [diff] | |
| parent | 0a235525dbc0b4791716b5a35b453ede31a1eb15 [diff] |
am 55f6979a: (-s ours) am d34e8ebc: (-s ours) am 5d3249d6: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dev * commit '55f6979a5ff52de6004e003404546cf137e50379': Import translations. DO NOT MERGE