| commit | 50262550141207ba55a396a012495b3c49daf805 | [log] [tgz] |
|---|---|---|
| author | Geoff Mendal <mendal@google.com> | Thu Aug 27 12:21:11 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Thu Aug 27 12:21:11 2015 +0000 |
| tree | 22a8c4fafef7f8b49e5f05a44b9a44ec88f01449 | |
| parent | e7601cc8515af53d693a260161099e3ee394e484 [diff] | |
| parent | b788ac5367be4805461f025ab568eb44b74a9e5f [diff] |
am b788ac53: (-s ours) am 3279c8bb: (-s ours) Import translations. DO NOT MERGE * commit 'b788ac5367be4805461f025ab568eb44b74a9e5f':