| commit | b2568ed0d1ae4cdaabcb061b2a503fece4aaa22a | [log] [tgz] |
|---|---|---|
| author | Geoff Mendal <mendal@google.com> | Mon Oct 19 14:33:34 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Mon Oct 19 14:33:34 2015 +0000 |
| tree | d3471e5457d7180986c53211145cadf734c8ad96 | |
| parent | ca059bfb439df9db2c4ee2f7d860e8a29bf0a91f [diff] | |
| parent | 35e01bf70f560c3651ae34968cd1082cb2dd8536 [diff] |
am 35e01bf7: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dr-dev am: 84c62dde3d -s ours * commit '35e01bf70f560c3651ae34968cd1082cb2dd8536': Import translations. DO NOT MERGE