| commit | 4e9cb4e294f4227afb5589509efb6d95a208a8de | [log] [tgz] |
|---|---|---|
| author | Geoff Mendal <mendal@google.com> | Wed Jul 15 22:57:40 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Wed Jul 15 22:57:40 2015 +0000 |
| tree | 18c580693446704f3d1e39d971c7b9d293e4c25b | |
| parent | 812ad1aa4e9f0558e800bbc234a278f205b1e8a8 [diff] | |
| parent | c71670109681040c676895b1db962753db0414e9 [diff] |
am c7167010: (-s ours) am 9139d5b0: (-s ours) am 4155d9f3: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dev * commit 'c71670109681040c676895b1db962753db0414e9': Import translations. DO NOT MERGE