commit | 4b4c835bd9c5d9a815f09c1fb8068f57e47f4c85 | [log] [tgz] |
---|---|---|
author | Baligh Uddin <baligh@google.com> | Thu Apr 10 15:58:27 2014 +0000 |
committer | Android Git Automerger <android-git-automerger@android.com> | Thu Apr 10 15:58:27 2014 +0000 |
tree | 08148819c8491daa2d88fdd4bdeedc96b837500f | |
parent | 8790927424ce0b1e76f15843a3980c14b4a55073 [diff] | |
parent | 6a641a569987f5edd725cb2dea6a992751cfbfbe [diff] |
am 6a641a56: (-s ours) Merge "Import translations. DO NOT MERGE" into ub-now-mister-ugly * commit '6a641a569987f5edd725cb2dea6a992751cfbfbe': Import translations. DO NOT MERGE