commit | 33ead118a81cbb505161e8a81af2bdff578c7620 | [log] [tgz] |
---|---|---|
author | Geoff Mendal <mendal@google.com> | Wed Oct 07 15:59:51 2015 +0000 |
committer | Android Git Automerger <android-git-automerger@android.com> | Wed Oct 07 15:59:51 2015 +0000 |
tree | c89da9ce6365c618156f432b6d08bb9962086ab7 | |
parent | e3cfc50cb04c8965c9f286e874ec6d2f4f446e03 [diff] | |
parent | 55d7bf4f5cb26c4f26c3ac6cbad0b8ca3c0ad579 [diff] |
am 55d7bf4f: (-s ours) am 32f4b469: (-s ours) am 47e870ad: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dr-dev * commit '55d7bf4f5cb26c4f26c3ac6cbad0b8ca3c0ad579': Import translations. DO NOT MERGE