commit | eb99c8260252a90ff329f834b3b18088236d53f2 | [log] [tgz] |
---|---|---|
author | Geoff Mendal <mendal@google.com> | Mon Jan 12 17:19:25 2015 +0000 |
committer | android-build-merger <android-build-merger@google.com> | Mon Jan 12 17:19:25 2015 +0000 |
tree | e64468d59376cdd075892266e3303401edbb4636 | |
parent | 979dc00bb9061d4bf448b9880096a323d06f19dd [diff] | |
parent | 8858db6b7eaabd5ce4356c9a48dff082c3af21d5 [diff] |
Merge "Import translations. DO NOT MERGE" into lmp-mr1-ub-dev automerge: 8858db6 -s ours * commit '8858db6b7eaabd5ce4356c9a48dff082c3af21d5': Import translations. DO NOT MERGE