| commit | a834ade484d5490c99d7142f403e4d94b798f838 | [log] [tgz] |
|---|---|---|
| author | Baligh Uddin <baligh@google.com> | Sat Jan 31 01:07:39 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Sat Jan 31 01:07:39 2015 +0000 |
| tree | 10da860fcff71886af91d082e31f0e1917926848 | |
| parent | 038707b4f74428d0468e6966106e5c4372252036 [diff] | |
| parent | e8f27a97273802fbf55874cf34b6d2ed14165640 [diff] |
am e8f27a97: (-s ours) am 916421ca: (-s ours) Merge "Import translations. DO NOT MERGE" into ub-now-porkchop * commit 'e8f27a97273802fbf55874cf34b6d2ed14165640':