| commit | 812ad1aa4e9f0558e800bbc234a278f205b1e8a8 | [log] [tgz] |
|---|---|---|
| author | Geoff Mendal <mendal@google.com> | Wed Jul 15 22:57:34 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Wed Jul 15 22:57:34 2015 +0000 |
| tree | 18c580693446704f3d1e39d971c7b9d293e4c25b | |
| parent | 34cfc5c83ddaad59c9aa8cf047b36f73e5dfee65 [diff] | |
| parent | a2ab4fc82629f200d93fa77a29094ff3ecb86af3 [diff] |
am a2ab4fc8: (-s ours) am f88916ca: (-s ours) am 197e7381: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dev * commit 'a2ab4fc82629f200d93fa77a29094ff3ecb86af3': Import translations. DO NOT MERGE