| commit | 8655be287d07e96e199502777f403bb38a766ba0 | [log] [tgz] |
|---|---|---|
| author | Geoff Mendal <mendal@google.com> | Sat Aug 01 17:03:47 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Sat Aug 01 17:03:47 2015 +0000 |
| tree | cedcdc410c4f72dbeb8e39b89ff3ddc105302b42 | |
| parent | bce70a1f9b852c857e1820d22324f60ac60862db [diff] | |
| parent | c2d8a52393941f7019ce81c3a3a523871bd8680f [diff] |
am c2d8a523: (-s ours) am 5d4bd09d: (-s ours) am bd24631d: (-s ours) Import translations. DO NOT MERGE * commit 'c2d8a52393941f7019ce81c3a3a523871bd8680f': Import translations. DO NOT MERGE