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