| commit | 8472b36886c1b94ad308cc3479acb2215ac44318 | [log] [tgz] |
|---|---|---|
| author | Geoff Mendal <mendal@google.com> | Fri Feb 27 16:46:58 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Fri Feb 27 16:46:58 2015 +0000 |
| tree | 55f124a60d3055465a2303d05c8cea510af30024 | |
| parent | ebcac0aa5992ade0bb3598872ca6f6ddba1d1768 [diff] | |
| parent | d3c5d3f59450fe907ccdb79a43e7b5d1096507e8 [diff] |
am d3c5d3f5: (-s ours) am 3d6f7812: (-s ours) Merge "Import translations. DO NOT MERGE" into stage-aosp-master * commit 'd3c5d3f59450fe907ccdb79a43e7b5d1096507e8': Import translations. DO NOT MERGE