| commit | 4ae16a510da9799bdb29a267028cf68f1d17cc85 | [log] [tgz] |
|---|---|---|
| author | Baligh Uddin <baligh@google.com> | Fri Sep 12 10:49:50 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Fri Sep 12 10:49:50 2014 +0000 |
| tree | eec0511e5543e3faa1700c0cc5a5ffdbc6240bb3 | |
| parent | 0c2fa7f24d95edd5d940e7bb035519902f972e6a [diff] | |
| parent | ea2d4258c2ae295bacc711843bd3b43666272854 [diff] |
am ea2d4258: (-s ours) am f1bc3d1b: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-dev * commit 'ea2d4258c2ae295bacc711843bd3b43666272854': Import translations. DO NOT MERGE