| commit | 5b9e3290062e4065aeb45085ea908b81c1fbe909 | [log] [tgz] |
|---|---|---|
| author | Geoff Mendal <mendal@google.com> | Wed Aug 19 14:20:53 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Wed Aug 19 14:20:53 2015 +0000 |
| tree | ff902917e64d15483d08ce332d98b8bf3d2dcc33 | |
| parent | 2c6fe6c1ca362411f42afc22bb4c08082d03b636 [diff] | |
| parent | 257a9a87d49a6bda05e9d18940152213fd156f0f [diff] |
am 257a9a87: (-s ours) am 81d99d47: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dr-dev * commit '257a9a87d49a6bda05e9d18940152213fd156f0f': Import translations. DO NOT MERGE