commit | d1311fbf382c72abd140ebe5356cddfb046ee451 | [log] [tgz] |
---|---|---|
author | Geoff Mendal <mendal@google.com> | Mon Oct 20 13:58:44 2014 +0000 |
committer | android-build-merger <android-build-merger@google.com> | Mon Oct 20 13:58:44 2014 +0000 |
tree | a38541d0af4c5fae4e89875466497026bc9388aa | |
parent | d159e0353c1f96ba25b91c18c7e48e95d05e111c [diff] | |
parent | bae5d85a773af7c40578160ca4ba4261de0c68c5 [diff] |
Merge "Import translations. DO NOT MERGE" into lmp-dev automerge: bae5d85 -s ours * commit 'bae5d85a773af7c40578160ca4ba4261de0c68c5': Import translations. DO NOT MERGE