| commit | 8bc54dea7addcc2f325768035cd1825436da0977 | [log] [tgz] |
|---|---|---|
| author | Geoff Mendal <mendal@google.com> | Mon Jun 01 15:46:04 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Mon Jun 01 15:46:04 2015 +0000 |
| tree | d7d4b592a38a07777900b078b761a197a2abf29d | |
| parent | 10f82d78cdda9e9ca40755745207b190f108a3bf [diff] | |
| parent | ca89b80dc20131d2fa4c45e990aaa6f846ab8de8 [diff] |
am 777767cb: (-s ours) am 8474bf48: (-s ours) am 8320436c: (-s ours) Merge "Revert "Import translations. DO NOT MERGE"" into mnc-dev * commit '777767cb928123684d4e30f5eb5bbaf3d560cca3': Revert "Import translations. DO NOT MERGE"