| commit | 2ca702a8a04016fa3c41ff6a982c68607e933080 | [log] [tgz] |
|---|---|---|
| author | Baligh Uddin <baligh@google.com> | Fri Nov 07 16:14:02 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Fri Nov 07 16:14:02 2014 +0000 |
| tree | 7dc28272b68d4f0bff67581ee191b80f5edb15f8 | |
| parent | 1021bb96d15cddfaa05aff5186285be582eeade3 [diff] | |
| parent | e6f060fff0f85cf7c202e38493d56514c6b5c6b5 [diff] |
am e6f060ff: (-s ours) am 8188fb92: (-s ours) am 714e1636: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-mr1-dev * commit 'e6f060fff0f85cf7c202e38493d56514c6b5c6b5': Import translations. DO NOT MERGE