| commit | e82dcd329f186637a7fd23d11a0e123612ee6d4a | [log] [tgz] |
|---|---|---|
| author | Geoff Mendal <mendal@google.com> | Wed Jul 15 22:57:22 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Wed Jul 15 22:57:22 2015 +0000 |
| tree | 18c580693446704f3d1e39d971c7b9d293e4c25b | |
| parent | 2ce2c76498a29e91bba9f53ec80da2ed48bcc031 [diff] | |
| parent | 80e9c04e910f88283f34dddac36f32db291e9c63 [diff] |
am 80e9c04e: (-s ours) am f48b416e: (-s ours) am a5516e80: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dev * commit '80e9c04e910f88283f34dddac36f32db291e9c63': Import translations. DO NOT MERGE