| commit | 5c9eac58849c152ef487c11996b6137b6e2b9bd6 | [log] [tgz] |
|---|---|---|
| author | Baligh Uddin <baligh@google.com> | Fri Sep 19 16:30:37 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Fri Sep 19 16:30:37 2014 +0000 |
| tree | 2033b01877caa45eaa1fccda0054bf09e210b386 | |
| parent | 1a780826c2f24b5414c6e0e5b3d9fbc55c0be887 [diff] | |
| parent | cad59dd01516a8b531919967c70204881a767cae [diff] |
am 7922c824: (-s ours) am 0c137bb9: (-s ours) am 67ea9443: (-s ours) am 45e72ffc: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-dev * commit '7922c8242bdf3c52f637cba239b736a5a3987ee4': Import translations. DO NOT MERGE