| commit | 15f76355228b7aa1f48233f5aef8dccbf6fc82e7 | [log] [tgz] |
|---|---|---|
| author | Geoff Mendal <mendal@google.com> | Mon Jul 20 15:00:28 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Mon Jul 20 15:00:28 2015 +0000 |
| tree | 5fb285335d947d809bbc8143fee6b5c0afaebae0 | |
| parent | d58a035f9559f142c6ed3f4fa2e02bb3afdf66fe [diff] | |
| parent | 7fa4d2a748b94aaddba1a523e671eeea4031ce64 [diff] |
am 7fa4d2a7: (-s ours) am f3d1f3af: (-s ours) am 5cc92074: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dr-dev * commit '7fa4d2a748b94aaddba1a523e671eeea4031ce64': Import translations. DO NOT MERGE