| commit | 36dcb7e95b798aa272226ee72692ffcceeab255d | [log] [tgz] |
|---|---|---|
| author | Baligh Uddin <baligh@google.com> | Fri Aug 22 17:50:04 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Fri Aug 22 17:50:04 2014 +0000 |
| tree | 35ec192587db11bfe56c180305c0471cdba8bcfb | |
| parent | 6764f4b1a8c674541e910313a94696adfa52e085 [diff] | |
| parent | 132f44ca8125db4aa1c8fa28238c3f37ad67b358 [diff] |
am 132f44ca: (-s ours) am bdfc17ce: (-s ours) Merge "Import translations. DO NOT MERGE" into ub-now-porkchop * commit '132f44ca8125db4aa1c8fa28238c3f37ad67b358': Import translations. DO NOT MERGE