| commit | c38f20080304c18bdb0bf90f942146ca53dff752 | [log] [tgz] |
|---|---|---|
| author | Geoff Mendal <mendal@google.com> | Mon Jun 01 15:25:47 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Mon Jun 01 15:25:47 2015 +0000 |
| tree | cf13f318ee034c19b659a8b938567426ad2a32d2 | |
| parent | 777767cb928123684d4e30f5eb5bbaf3d560cca3 [diff] | |
| parent | c5508f8560b48a195f5b19dab98b0bc1bb85928b [diff] |
am c5508f85: (-s ours) am 55b4b2d5: (-s ours) Merge "Revert "Import translations. DO NOT MERGE"" into mnc-dev * commit 'c5508f8560b48a195f5b19dab98b0bc1bb85928b': Revert "Import translations. DO NOT MERGE"