commit | 97cc56623cb9222d8f6c55cf53a04518b7dfd6a8 | [log] [tgz] |
---|---|---|
author | Baligh Uddin <baligh@google.com> | Sun Aug 17 14:24:19 2014 +0000 |
committer | Android Git Automerger <android-git-automerger@android.com> | Sun Aug 17 14:24:19 2014 +0000 |
tree | 1a85c56fe5f4ec955bf1353ac9776b39396a627c | |
parent | 7e809331f6168e3fc468d7b1fc2fc85dc6812e38 [diff] | |
parent | 282de588c41341f0a0ba4f7c6e503b417d0b748d [diff] |
am 282de588: (-s ours) am 5a470175: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-dev * commit '282de588c41341f0a0ba4f7c6e503b417d0b748d': Import translations. DO NOT MERGE