| commit | 8dc2209ebf31bbb99ef1f2eb6d5c4bdf9069b4ce | [log] [tgz] |
|---|---|---|
| author | Geoff Mendal <mendal@google.com> | Thu Mar 26 21:00:37 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Thu Mar 26 21:00:37 2015 +0000 |
| tree | f51bfa4fe52218248dc4f03eab6188b76a183b45 | |
| parent | 7424f8c587fb4802d4b923e9b512f66a28f24c97 [diff] | |
| parent | 3a496eb86cf9db788874d1b0e4628a9c3efd1a2d [diff] |
am 3a496eb8: (-s ours) am a2fd9c6c: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-mr1-dev * commit '3a496eb86cf9db788874d1b0e4628a9c3efd1a2d':