| commit | bd15704d42dea8e327fe0071a9a454e409680cf9 | [log] [tgz] |
|---|---|---|
| author | Baligh Uddin <baligh@google.com> | Sat Jan 31 02:02:21 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Sat Jan 31 02:02:21 2015 +0000 |
| tree | 04cb84065111e87ee896e2b56a6301043a2bc940 | |
| parent | 59034e7f24af8da64c0ab46bbe4321afbb4d09e1 [diff] | |
| parent | 5702f372a016128cd60edd24501c82e2b2ce1be8 [diff] |
am 5702f372: (-s ours) am f82c86c2: (-s ours) am 10047138: (-s ours) Merge "Import translations. DO NOT MERGE" into ub-now-porkchop * commit '5702f372a016128cd60edd24501c82e2b2ce1be8':