| commit | 855184113cfd367c7b4d5700bf342ad9141e988e | [log] [tgz] |
|---|---|---|
| author | Geoff Mendal <mendal@google.com> | Mon Jul 27 14:14:27 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Mon Jul 27 14:14:27 2015 +0000 |
| tree | 12fb99433e14283dcd49f02e5aa593944509093d | |
| parent | 7339ed18978ae640a8ac053053459e1ef8c6bc8d [diff] | |
| parent | 3a5edd9f183789090b657ab92db1425e74082fa6 [diff] |
am 3a5edd9f: (-s ours) am 4cd6da53: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dr-dev * commit '3a5edd9f183789090b657ab92db1425e74082fa6': Import translations. DO NOT MERGE