| commit | f86d2871dbf71f4b2fa5118510a823818488d83d | [log] [tgz] |
|---|---|---|
| author | Baligh Uddin <baligh@google.com> | Sat Jan 31 06:21:48 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Sat Jan 31 06:21:48 2015 +0000 |
| tree | c028bfe537607823c37e2ffc8c713c73059d3130 | |
| parent | dc15ca0c0c92d3ee56bf8471922cee72dcaa8be5 [diff] | |
| parent | a6d27a5410c5052d8b91e250326a91755b6b4523 [diff] |
am a6d27a54: (-s ours) am 8057d62d: (-s ours) am 132f44ca: (-s ours) am bdfc17ce: (-s ours) Merge "Import translations. DO NOT MERGE" into ub-now-porkchop * commit 'a6d27a5410c5052d8b91e250326a91755b6b4523':