| commit | ed2f33ce76eac9b74b9b105bafbc328560b18d57 | [log] [tgz] |
|---|---|---|
| author | Geoff Mendal <mendal@google.com> | Mon Jun 01 15:25:36 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Mon Jun 01 15:25:36 2015 +0000 |
| tree | cf13f318ee034c19b659a8b938567426ad2a32d2 | |
| parent | a0962acfbe9d0d1d852e4b4aced18974a6ea6141 [diff] | |
| parent | 6c15c153fa831264f1134b703107acf40e206728 [diff] |
am 6c15c153: (-s ours) am 99177687: (-s ours) Merge "Revert "Import translations. DO NOT MERGE"" into mnc-dev * commit '6c15c153fa831264f1134b703107acf40e206728': Revert "Import translations. DO NOT MERGE"