| commit | 700c836c8b8998410bda334abc5114b7c20df40c | [log] [tgz] |
|---|---|---|
| author | Geoff Mendal <mendal@google.com> | Mon Feb 23 14:02:43 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Mon Feb 23 14:02:43 2015 +0000 |
| tree | e1d2a292a41ae8e91858b91b1730b36be9dc9f28 | |
| parent | 77892a62eb017f9b0c40d42b5842156550b56048 [diff] | |
| parent | c8a4babe93e4fd0cecb6b91a020b9252ac426004 [diff] |
am c8a4babe: (-s ours) am 5211dfd5: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-mr1-modular-dev * commit 'c8a4babe93e4fd0cecb6b91a020b9252ac426004': Import translations. DO NOT MERGE