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