| commit | ec09ae117f2bb3bf58481706a2d65a88b9186fad | [log] [tgz] |
|---|---|---|
| author | Geoff Mendal <mendal@google.com> | Thu Aug 27 22:05:10 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Thu Aug 27 22:05:10 2015 +0000 |
| tree | 36aef968cd6bf136e35dd163bafe3b05519412c2 | |
| parent | b51719296d76f607677705e71dbab28c58f5490a [diff] | |
| parent | 642daa69ac89ea2b2bb30651ef90c2178c8a4547 [diff] |
am 642daa69: (-s ours) am 51436443: (-s ours) am cd64ce87: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dev * commit '642daa69ac89ea2b2bb30651ef90c2178c8a4547':