commit | cd43c99cce3a0ee0df34be3eda795d1e70497446 | [log] [tgz] |
---|---|---|
author | Geoff Mendal <mendal@google.com> | Mon Nov 03 17:57:24 2014 +0000 |
committer | android-build-merger <android-build-merger@google.com> | Mon Nov 03 17:57:24 2014 +0000 |
tree | 9f58034024c80bbb921f92b6db287f2074641d4e | |
parent | ffada671db0fefd98464185651ead1b78df00f21 [diff] | |
parent | 3765ae9ff1a7584623f5f4c69d50bdf011664f81 [diff] |
am ef8c3cc4: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-mr1-dev automerge: 3765ae9 -s ours * commit '3765ae9ff1a7584623f5f4c69d50bdf011664f81': Import translations. DO NOT MERGE