| commit | ac0a155effbd9ca4c7f2bb721983a35f9a9b1968 | [log] [tgz] |
|---|---|---|
| author | Baligh Uddin <baligh@google.com> | Sat Jan 31 02:01:17 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Sat Jan 31 02:01:17 2015 +0000 |
| tree | 273b4b3aa02796bc8bdd73e40e26d81c25fa5e25 | |
| parent | 19e93807dc1784f535a1c0b29bcbecd6093fd34d [diff] | |
| parent | a834ade484d5490c99d7142f403e4d94b798f838 [diff] |
am a834ade4: (-s ours) am e8f27a97: (-s ours) am 916421ca: (-s ours) Merge "Import translations. DO NOT MERGE" into ub-now-porkchop * commit 'a834ade484d5490c99d7142f403e4d94b798f838':