commit | c84e354cfdd3380acbbd086c1f40511afa79e9ae | [log] [tgz] |
---|---|---|
author | Geoff Mendal <mendal@google.com> | Thu Jan 29 01:11:45 2015 +0000 |
committer | Android Git Automerger <android-git-automerger@android.com> | Thu Jan 29 01:11:45 2015 +0000 |
tree | 2ef54c527c645167369d27cd0bb02d6e59f4baa5 | |
parent | 01c2e28b66865c2b3264a1b5caf9a2dfc3b795bc [diff] | |
parent | ca58fb9c0bbe31f8d626c0c2dab39569b6a03d5a [diff] |
am ca58fb9c: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-mr1-dev * commit 'ca58fb9c0bbe31f8d626c0c2dab39569b6a03d5a': Import translations. DO NOT MERGE