| commit | ebcac0aa5992ade0bb3598872ca6f6ddba1d1768 | [log] [tgz] |
|---|---|---|
| author | Geoff Mendal <mendal@google.com> | Fri Feb 27 16:46:56 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Fri Feb 27 16:46:56 2015 +0000 |
| tree | 55f124a60d3055465a2303d05c8cea510af30024 | |
| parent | 311c99b4868c10cb4f2c7f9130990d271c0bf8ec [diff] | |
| parent | 4588065664a5791225affef44af12eb53a5f7e31 [diff] |
am 45880656: (-s ours) am 189be54f: (-s ours) Merge "Import translations. DO NOT MERGE" into stage-aosp-master * commit '4588065664a5791225affef44af12eb53a5f7e31': Import translations. DO NOT MERGE